These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / fs / sysfs / file.c

diff --git a/kernel/fs/sysfs/file.c b/kernel/fs/sysfs/file.c
index 7c2867b..f35523d 100644 (file)
--- a/kernel/fs/sysfs/file.c
+++ b/kernel/fs/sysfs/file.c
@@ -90,7 +90,7 @@ static ssize_t sysfs_kf_bin_read(struct kernfs_open_file *of, char *buf,
                return 0;
 
        if (size) {
-               if (pos > size)
+               if (pos >= size)
                        return 0;
                if (pos + count > size)
                        count = size - pos;
@@ -108,6 +108,7 @@ static ssize_t sysfs_kf_read(struct kernfs_open_file *of, char *buf,
 {
        const struct sysfs_ops *ops = sysfs_file_ops(of->kn);
        struct kobject *kobj = of->kn->parent->priv;
+       size_t len;
 
        /*
         * If buf != of->prealloc_buf, we don't know how
@@ -115,7 +116,8 @@ static ssize_t sysfs_kf_read(struct kernfs_open_file *of, char *buf,
         */
        if (pos || WARN_ON_ONCE(buf != of->prealloc_buf))
                return 0;
-       return ops->show(kobj, of->kn->priv, buf);
+       len = ops->show(kobj, of->kn->priv, buf);
+       return min(count, len);
 }
 
 /* kernfs write callback for regular sysfs files */