Fix a rare memory leak in kobject_set_name_vargs
PATCH 1/1 Fix a rare memory leak in kobject_set_name_vargs
Hello Greg,
This is a possible memory leak that I discovered only by accidental code reading.
--
If kvasprintf fails in kobject_set_name_vargs, the memory used by the original kobj->name is leaked. Fix that. I also avoid useless memory accesses to kobj->name by using the local variables old_name and new_name instead.
linux-2.6.x/lib/kobject.c +6 -4
@@ -216,20 +216,22 @@ int kobject_set_name_vargs(struct kobjec va_list vargs) {const char *old_name = kobj->name; +char *new_name;char *s; -if (kobj->name && !fmt) +if (old_name && !fmt)return 0 ; - kobj->name =kvasprintf (GFP_KERNEL , fmt, vargs); -if (!kobj->name) + new_name =kvasprintf (GFP_KERNEL , fmt, vargs); +if (!new_name)return -ENOMEM ;/* ewww... some of these buggers have '/' in the name ... */ -while ((s =strchr (kobj->name,'/' ))) +while ((s =strchr (new_name,'/' ))) s[0 ] ='!' ;kfree (old_name); + kobj->name = new_name;return 0 ; }
Quoted 33 lines · Philippe De Muyter
Hello Greg,
This is a possible memory leak that I discovered only by accidental code reading.
--
If kvasprintf fails in
kobject_set_name_vargs, the memory used by the originalkobj->nameis leaked. Fix that. I also avoid useless memory accesses tokobj->nameby using the local variablesold_nameandnew_nameinstead.Signed-off-by Philippe De Muyter <[email protected]>diff -r
373fdd3df333linux-2.6.x/lib/kobject.clinux-2.6.x/lib/kobject.c +4
-3@@ -216,20 +216,22 @@ int kobject_set_name_vargs(struct kobjec va_list vargs) {const char *old_name = kobj->name; +char *new_name;char *s; -if (kobj->name && !fmt) +if (old_name && !fmt)return 0 ; - kobj->name =kvasprintf (GFP_KERNEL , fmt, vargs); -if (!kobj->name) + new_name =kvasprintf (GFP_KERNEL , fmt, vargs); +if (!new_name)return -ENOMEM ;
linux-2.6.x/lib/kobject.c int kobject_set_name_vargs(struct kobjec · line 236
Quoted 10 lines
linux-2.6.x/lib/kobject.c +2
-1/* ewww... some of these buggers have '/' in the name ... */ -while ((s =strchr (kobj->name,'/' ))) +while ((s =strchr (new_name,'/' ))) s[0 ] ='!' ;kfree (old_name); + kobj->name = new_name;return 0 ; }
the routine kobject_set_name_vargs() is described inDocumentation/kobject.txt as "legacy cruft" to be removed at some point, so it's not clear there's any value in "fixing" it.
rday
--
========================================================================
Robert P. J. Day Waterloo, Ontario, CANADA
Linux Consulting, Training and Kernel Pedantry.
Web page: http://crashcourse.ca Twitter: http://twitter.com/rpjday
========================================================================
Quoted 41 lines · Robert P. J. Day
Quoted 39 lines · Philippe De Muyter
Hello Greg,
This is a possible memory leak that I discovered only by accidental code reading.
--
If kvasprintf fails in
kobject_set_name_vargs, the memory used by the originalkobj->nameis leaked. Fix that. I also avoid useless memory accesses tokobj->nameby using the local variablesold_nameandnew_nameinstead.Signed-off-by Philippe De Muyter <[email protected]>diff -r
373fdd3df333linux-2.6.x/lib/kobject.clinux-2.6.x/lib/kobject.c +5
-4@@ -216,20 +216,22 @@ int kobject_set_name_vargs(struct kobjec va_list vargs) {const char *old_name = kobj->name; +char *new_name;char *s; -if (kobj->name && !fmt) +if (old_name && !fmt)return 0 ; - kobj->name =kvasprintf (GFP_KERNEL , fmt, vargs); -if (!kobj->name) + new_name =kvasprintf (GFP_KERNEL , fmt, vargs); +if (!new_name)return -ENOMEM ;/* ewww... some of these buggers have '/' in the name ... */ -while ((s =strchr (kobj->name,'/' ))) +while ((s =strchr (new_name,'/' ))) s[0 ] ='!' ;
Quoted 9 lines
linux-2.6.x/lib/kobject.c int kobject_set_name_vargs(struct kobjec · line 236
Quoted 4 lines
linux-2.6.x/lib/kobject.c +1
-0kfree (old_name); + kobj->name = new_name;return 0 ; }the routine
kobject_set_name_vargs()is described inDocumentation/kobject.txtas "legacy cruft" to be removed at some point, so it's not clear there's any value in "fixing" it.
Given I submitted a similar patch two days before, I guess a fix would be welcome or else we might see one or two attempts per week from various people.
http://lkml.org/lkml/2010/3/11/438
Legacy or not, this code looks wrong. I caught it while looking for kmemleaks reports on my dev machine, that were triggered by CONFIG_NO_BOOTMEM use.
Quoted 56 lines · Eric Dumazet
Quoted 41 lines · Robert P. J. Day
Quoted 39 lines · Philippe De Muyter
Hello Greg,
This is a possible memory leak that I discovered only by accidental code reading.
--
If kvasprintf fails in
kobject_set_name_vargs, the memory used by the originalkobj->nameis leaked. Fix that. I also avoid useless memory accesses tokobj->nameby using the local variablesold_nameandnew_nameinstead.Signed-off-by Philippe De Muyter <[email protected]>diff -r
373fdd3df333linux-2.6.x/lib/kobject.clinux-2.6.x/lib/kobject.c +5
-4@@ -216,20 +216,22 @@ int kobject_set_name_vargs(struct kobjec va_list vargs) {const char *old_name = kobj->name; +char *new_name;char *s; -if (kobj->name && !fmt) +if (old_name && !fmt)return 0 ; - kobj->name =kvasprintf (GFP_KERNEL , fmt, vargs); -if (!kobj->name) + new_name =kvasprintf (GFP_KERNEL , fmt, vargs); +if (!new_name)return -ENOMEM ;/* ewww... some of these buggers have '/' in the name ... */ -while ((s =strchr (kobj->name,'/' ))) +while ((s =strchr (new_name,'/' ))) s[0 ] ='!' ;Quoted 9 lines
linux-2.6.x/lib/kobject.c int kobject_set_name_vargs(struct kobjec · line 236
Quoted 4 lines
linux-2.6.x/lib/kobject.c +1
-0kfree (old_name); + kobj->name = new_name;return 0 ; }the routine
kobject_set_name_vargs()is described inDocumentation/kobject.txtas "legacy cruft" to be removed at some point, so it's not clear there's any value in "fixing" it.Given I submitted a similar patch two days before, I guess a fix would be welcome or else we might see one or two attempts per week from various people.
Quoted 5 lines
http://lkml.org/lkml/2010/3/11/438
Legacy or not, this code looks wrong. I caught it while looking for kmemleaks reports on my dev machine, that were triggered by
CONFIG_NO_BOOTMEMuse.
fair enough, i was just going off of what i read in Doc/kobject.txt.
rday
--
========================================================================
Robert P. J. Day Waterloo, Ontario, CANADA
Linux Consulting, Training and Kernel Pedantry.
Web page: http://crashcourse.ca Twitter: http://twitter.com/rpjday
========================================================================