w1_therm: Free the correct variable
Subsystems (2)
PATCH 1/1 w1_therm: Free the correct variable
The problem is that we change "p_args" to point to the middle of the string so when we free it at the end of the function it's not freeing the same pointer that we originally allocated.
---
From static analysis. I guess it must not cause too much of a problem at run time?
drivers/w1/slaves/w1_therm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/w1/slaves/w1_therm.c +3 -2
@@ -1526,8 +1526,9 @@ static ssize_t alarms_store(struct device *device,int temp, ret = -EINVAL ;char *token =NULL ;s8 tl, th, tt;/* 1 byte per value + temp ring order */ -char *p_args =kmalloc (size,GFP_KERNEL ); +char *p_args, *orig; + p_args = orig =kmalloc (size,GFP_KERNEL );/* Safe string copys as buf is const */ if (!p_args) { dev_warn(device,
@@ -1611,7 +1612,7 @@ static ssize_t alarms_store(struct device *device, free_m:/* free allocated memory */ -kfree (p_args); +kfree (orig);return size; }
Signature · 1 line
2.26.2
Hi,
Quoted 29 lines · Dan Carpenter
The problem is that we change "
p_args" to point to the middle of the string so when we free it at the end of the function it's not freeing the same pointer that we originally allocated.Fixes e2c94d6f5720 ("w1_therm: adding alarm sysfs entry")Signed-off-by Dan Carpenter <[email protected]>---
From static analysis. I guess it must not cause too much of a problem at run time?drivers/w1/slaves/w1_therm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)drivers/w1/slaves/w1_therm.c +2
-1@@ -1526,8 +1526,9 @@ static ssize_t alarms_store(struct device *device,int temp, ret = -EINVAL ;char *token =NULL ;s8 tl, th, tt;/* 1 byte per value + temp ring order */ -char *p_args =kmalloc (size,GFP_KERNEL ); +char *p_args, *orig; + p_args = orig =kmalloc (size,GFP_KERNEL );/* Safe string copys as buf is const */ if (!p_args) { dev_warn(device,
drivers/w1/slaves/w1_therm.c static ssize_t alarms_store(struct device *device, · line 1618
Quoted 8 lines
drivers/w1/slaves/w1_therm.c +1
-1@@ -1611,7 +1612,7 @@ static ssize_t alarms_store(struct device *device, free_m:/* free allocated memory */ -kfree (p_args); +kfree (orig);return size; }
I tested it on several devices to be safe, no issue at runtime. Sorry for the mistake and thanks for the fix.
Akira Shimahara