From: Neil Horman <nhorman@redhat.com>
Date: Tue, 6 Sep 2005 22:17:30 +0000 (-0700)
Subject: [PATCH] Add missing overflow check in get_blkdev_list
X-Git-Tag: v2.6.14-rc1~679
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f62c6d0a2607b2d1fdf280d4d1467a7a6e24c67d;p=linux-2.6-omap-h63xx.git

[PATCH] Add missing overflow check in get_blkdev_list

Patch to clean up missing overflow check in get_blkdev_list.  The printf
which adds the "Block Devices" string in /proc/devices can overflow the
presented page if get_chrdev_list eats up the entire 4k space.

Signed-off-by: Neil Horman <nhorman@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/block/genhd.c b/drivers/block/genhd.c
index 47fd3659a06..d42840cc0d1 100644
--- a/drivers/block/genhd.c
+++ b/drivers/block/genhd.c
@@ -45,7 +45,7 @@ int get_blkdev_list(char *p, int used)
 	struct blk_major_name *n;
 	int i, len;
 
-	len = sprintf(p, "\nBlock devices:\n");
+	len = snprintf(p, (PAGE_SIZE-used), "\nBlock devices:\n");
 
 	down(&block_subsys_sem);
 	for (i = 0; i < ARRAY_SIZE(major_names); i++) {