[PATCH] sysfs: fix off-by-one error in fill_read_buffer

[Miao Xie]

Hi,everyone.
  I found that there is a off-by-one problem in the following code.

Version:	2.6.24-rc2
File:		fs/sysfs/file.c:118-122
Function:	fill_read_buffer
--------------------------------------------------------------------
	count = ops->show(kobj, attr_sd->s_attr.attr, buffer->page);

	sysfs_put_active_two(attr_sd);

	BUG_ON(count > (ssize_t)PAGE_SIZE);
--------------------------------------------------------------------
Because according to the specification of the sysfs and the implement of the
show methods, the show methods return the number of bytes which would be
generated for the given input, excluding the trailing null.So if the return
value of the show methods equals PAGE_SIZE - 1, the buffer is full in fact.
And if the return value equals PAGE_SIZE, the resulting string was already
truncated,or buffer overflow occurred.

This patch fixes an off-by-one error in fill_read_buffer.

Signed-off-by: Miao Xie <miaox@xxxxxxxxxxxxxx>

---
 fs/sysfs/file.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
index 27d1785..f98d66d 100644
--- a/fs/sysfs/file.c
+++ b/fs/sysfs/file.c
@@ -119,7 +119,7 @@ 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);
+	BUG_ON(count >= (ssize_t)PAGE_SIZE);
 	if (count >= 0) {
 		buffer->needs_read_fill = 0;
 		buffer->count = count;
--
1.5.3



-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/