Commit 9a926913 authored by Dan Carpenter's avatar Dan Carpenter Committed by Greg Kroah-Hartman

mtd: sm_ftl: heap corruption in sm_create_sysfs_attributes()

commit b4c23305 upstream.

We always put a NUL terminator one space past the end of the "vendor"
buffer.  Walter Harms also pointed out that this should just use
kstrndup().

Fixes: 7d17c02a ('mtd: Add new SmartMedia/xD FTL')
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c3a47361
...@@ -59,15 +59,12 @@ struct attribute_group *sm_create_sysfs_attributes(struct sm_ftl *ftl) ...@@ -59,15 +59,12 @@ struct attribute_group *sm_create_sysfs_attributes(struct sm_ftl *ftl)
struct attribute_group *attr_group; struct attribute_group *attr_group;
struct attribute **attributes; struct attribute **attributes;
struct sm_sysfs_attribute *vendor_attribute; struct sm_sysfs_attribute *vendor_attribute;
char *vendor;
int vendor_len = strnlen(ftl->cis_buffer + SM_CIS_VENDOR_OFFSET, vendor = kstrndup(ftl->cis_buffer + SM_CIS_VENDOR_OFFSET,
SM_SMALL_PAGE - SM_CIS_VENDOR_OFFSET); SM_SMALL_PAGE - SM_CIS_VENDOR_OFFSET, GFP_KERNEL);
char *vendor = kmalloc(vendor_len, GFP_KERNEL);
if (!vendor) if (!vendor)
goto error1; goto error1;
memcpy(vendor, ftl->cis_buffer + SM_CIS_VENDOR_OFFSET, vendor_len);
vendor[vendor_len] = 0;
/* Initialize sysfs attributes */ /* Initialize sysfs attributes */
vendor_attribute = vendor_attribute =
...@@ -78,7 +75,7 @@ struct attribute_group *sm_create_sysfs_attributes(struct sm_ftl *ftl) ...@@ -78,7 +75,7 @@ struct attribute_group *sm_create_sysfs_attributes(struct sm_ftl *ftl)
sysfs_attr_init(&vendor_attribute->dev_attr.attr); sysfs_attr_init(&vendor_attribute->dev_attr.attr);
vendor_attribute->data = vendor; vendor_attribute->data = vendor;
vendor_attribute->len = vendor_len; vendor_attribute->len = strlen(vendor);
vendor_attribute->dev_attr.attr.name = "vendor"; vendor_attribute->dev_attr.attr.name = "vendor";
vendor_attribute->dev_attr.attr.mode = S_IRUGO; vendor_attribute->dev_attr.attr.mode = S_IRUGO;
vendor_attribute->dev_attr.show = sm_attr_show; vendor_attribute->dev_attr.show = sm_attr_show;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment