diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-28 15:59:50 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-28 15:59:50 -0800 |
| commit | cae2f9c46d69edb1aee565917735d79aba3a3267 (patch) | |
| tree | 203ab78f46b6362859d53717eae7c60a437f07cc /fs | |
| parent | 09f345da758fca1222b0971b65b2fddbdf78bb83 (diff) | |
| parent | 8118a859dc7abd873193986c77a8d9bdb877adc8 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6:
sysfs: fix off-by-one error in fill_read_buffer()
kobject: two typo fixes
UIO: add UIO documentation target to DocBook Makefile
UIO: fix up the UIO documentation
create /sys/.../power when CONFIG_PM is set
allow LEGACY_PTYS to be set to 0
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/sysfs/file.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c index 27d1785b764..4045bdcc4b3 100644 --- a/fs/sysfs/file.c +++ b/fs/sysfs/file.c @@ -119,7 +119,11 @@ static int fill_read_buffer(struct dentry * dentry, struct sysfs_buffer * buffer sysfs_put_active_two(attr_sd); - BUG_ON(count > (ssize_t)PAGE_SIZE); + /* + * The code works fine with PAGE_SIZE return but it's likely to + * indicate truncated result or overflow in normal use cases. + */ + BUG_ON(count >= (ssize_t)PAGE_SIZE); if (count >= 0) { buffer->needs_read_fill = 0; buffer->count = count; |