Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'driver-core-4.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core fixes from Greg KH:
"Here are 3 small fixes for 4.11-rc6.
One resolves a reported issue with sysfs files that NeilBrown found,
one is a documenatation fix for the stable kernel rules, and the last
is a small MAINTAINERS file update for kernfs"
* tag 'driver-core-4.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
MAINTAINERS: separate out kernfs maintainership
sysfs: be careful of error returns from ops->show()
Documentation: stable-kernel-rules: fix stable-tag format
+14
-5
+1
-1
Documentation/process/stable-kernel-rules.rst
+1
-1
Documentation/process/stable-kernel-rules.rst
+9
-2
MAINTAINERS
+9
-2
MAINTAINERS
···
4117
4117
F: lib/lru_cache.c
4118
4118
F: Documentation/blockdev/drbd/
4119
4119
4120
-
DRIVER CORE, KOBJECTS, DEBUGFS, KERNFS AND SYSFS
4120
+
DRIVER CORE, KOBJECTS, DEBUGFS AND SYSFS
4121
4121
M: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
4122
4122
T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git
4123
4123
S: Supported
4124
4124
F: Documentation/kobject.txt
4125
4125
F: drivers/base/
4126
4126
F: fs/debugfs/
4127
-
F: fs/kernfs/
4128
4127
F: fs/sysfs/
4129
4128
F: include/linux/debugfs.h
4130
4129
F: include/linux/kobj*
···
7207
7208
F: arch/mips/include/uapi/asm/kvm*
7208
7209
F: arch/mips/include/asm/kvm*
7209
7210
F: arch/mips/kvm/
7211
+
7212
+
KERNFS
7213
+
M: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
7214
+
M: Tejun Heo <tj@kernel.org>
7215
+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git
7216
+
S: Supported
7217
+
F: include/linux/kernfs.h
7218
+
F: fs/kernfs/
7210
7219
7211
7220
KEXEC
7212
7221
M: Eric Biederman <ebiederm@xmission.com>
+4
-2
fs/sysfs/file.c
+4
-2
fs/sysfs/file.c
···
108
108
{
109
109
const struct sysfs_ops *ops = sysfs_file_ops(of->kn);
110
110
struct kobject *kobj = of->kn->parent->priv;
111
-
size_t len;
111
+
ssize_t len;
112
112
113
113
/*
114
114
* If buf != of->prealloc_buf, we don't know how
···
117
117
if (WARN_ON_ONCE(buf != of->prealloc_buf))
118
118
return 0;
119
119
len = ops->show(kobj, of->kn->priv, buf);
120
+
if (len < 0)
121
+
return len;
120
122
if (pos) {
121
123
if (len <= pos)
122
124
return 0;
123
125
len -= pos;
124
126
memmove(buf, buf + pos, len);
125
127
}
126
-
return min(count, len);
128
+
return min_t(ssize_t, count, len);
127
129
}
128
130
129
131
/* kernfs write callback for regular sysfs files */