thunderbolt: property: fix a buffer overflow and a missing check
PATCH 1/1 thunderbolt: property: fix a buffer overflow and a missing check
First, no memory is allocated for "property->value.text"; the following strcpy will lead to a buffer overflow.
Second, no check is enforced for the return value of kzalloc, which may lead to NULL-pointer dereference.
The patch fixes the two issues.
--- drivers/thunderbolt/property.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/thunderbolt/property.c +6 -1
@@ -587,7 +587,12 @@ int tb_property_add_text(struct tb_property_dir *parent, const char *key,return -ENOMEM ; property->length = size /4 ; - property->value.data =kzalloc (size,GFP_KERNEL ); + property->value.text =kzalloc (size,GFP_KERNEL ); +if (!property->value.text) { +kfree (property); +return -ENOMEM ; + } +strcpy (property->value.text, text);list_add_tail (&property->list, &parent->properties);
Signature · 1 line
2.17.1
Quoted 2 lines · Kangjie Lu
First, no memory is allocated for "
property->value.text"; the following strcpy will lead to a buffer overflow.
It is actually member of union so assigning via value.txt or value.data is the same.
So no buffer overflow.
Quoted 2 lines
Second, no check is enforced for the return value of kzalloc, which may lead to NULL-pointer dereference.
Yes, this is valid.
Can you fix the changelog accordingly and resend?
Quoted 28 lines
The patch fixes the two issues.
Signed-off-by Kangjie Lu <[email protected]>--- drivers/thunderbolt/property.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)drivers/thunderbolt/property.c +6
-1@@ -587,7 +587,12 @@ int tb_property_add_text(struct tb_property_dir *parent, const char *key,return -ENOMEM ; property->length = size /4 ; - property->value.data =kzalloc (size,GFP_KERNEL ); + property->value.text =kzalloc (size,GFP_KERNEL ); +if (!property->value.text) { +kfree (property); +return -ENOMEM ; + } +strcpy (property->value.text, text);list_add_tail (&property->list, &parent->properties);Signature · 1 line
2.17.1
Quoted 2 lines · Kangjie Lu
First, no memory is allocated for "
property->value.text"; the following strcpy will lead to a buffer overflow.
Fix the commit text as there is no overflow.
only the check and resource cleanp is the fix.
Quoted 7 lines
Second, no check is enforced for the return value of kzalloc, which may lead to NULL-pointer dereference.
The patch fixes the two issues.
Signed-off-by Kangjie Lu <[email protected]
Otherwise looks good.
-Mukesh
Quoted 22 lines
--- drivers/thunderbolt/property.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)drivers/thunderbolt/property.c +6
-1@@ -587,7 +587,12 @@ int tb_property_add_text(struct tb_property_dir *parent, const char *key,return -ENOMEM ; property->length = size /4 ; - property->value.data =kzalloc (size,GFP_KERNEL ); + property->value.text =kzalloc (size,GFP_KERNEL ); +if (!property->value.text) { +kfree (property); +return -ENOMEM ; + } +strcpy (property->value.text, text);list_add_tail (&property->list, &parent->properties);