mm/slub: clean up create_unique_id()
Subsystems (2)
PATCH v3 1/1 mm/slub: clean up create_unique_id()
From: Chao Yu <[email protected]>
As Christophe JAILLET suggested:
In create_unique_id(),
"looks that ID_STR_LENGTH could even be reduced to 32 or 16.
The 2nd BUG_ON at the end of the function could certainly be just removed as well or remplaced by a:
if (p > name + ID_STR_LENGTH - 1) {
kfree(name);
return -E<something>;
}"
According to above suggestion, let's do below cleanups:
1. reduce ID_STR_LENGTH to 32, as the buffer size should be enough;
2. use WARN_ON instead of BUG_ON() and return error if check condition is true;
3. use snprintf instead of sprintf to avoid overflow.
---
v3:
- clean up codes
- fix size parameter of snprintf()
mm/slub.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
mm/slub.c +6 -3
@@ -5890,7 +5890,7 @@ static inline struct kset *cache_kset(struct kmem_cache *s)return slab_kset; } -#define ID_STR_LENGTH 64 +#define ID_STR_LENGTH 32/* Create a unique string id for a slab cache: *
@@ -5924,9 +5924,12 @@ static char *create_unique_id(struct kmem_cache *s) *p++ ='A' ;if (p != name +1 ) *p++ ='-' ; - p +=sprintf (p,"%07u" , s->size); + p +=snprintf (p,ID_STR_LENGTH - (p - name),"%07u" , s->size); -BUG_ON (p > name +ID_STR_LENGTH -1 ); +if (WARN_ON (p > name +ID_STR_LENGTH -1 )) { +kfree (name); +return ERR_PTR (-EINVAL ); + }return name; }
Signature · 1 line
2.36.1
Quoted 22 lines · Chao Yu
From: Chao Yu <[email protected]>
As Christophe JAILLET suggested:
In
create_unique_id(),"looks that
ID_STR_LENGTHcould even be reduced to 32 or 16.The 2nd
BUG_ONat the end of the function could certainly be just removed as well or remplaced by a:if (p > name + ID_STR_LENGTH - 1) { kfree(name); return -E<something>; }"
According to above suggestion, let's do below cleanups:
1. reduceID_STR_LENGTHto 32, as the buffer size should be enough;
2. useWARN_ONinstead ofBUG_ON()and return error if check condition is true;
3. use snprintf instead of sprintf to avoid overflow.
Quoted 5 lines
Fixes 81819f0fc828 ("SLUB core")Suggested-by Christophe JAILLET <[email protected]>Reviewed-by Hyeonggon Yoo <[email protected]>Signed-off-by Chao Yu <[email protected]>
Thanks, added to slab.git for-next.
Quoted 35 lines
---
v3:
- clean up codes
- fix size parameter ofsnprintf()mm/slub.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)mm/slub.c +6
-3@@ -5890,7 +5890,7 @@ static inline struct kset *cache_kset(struct kmem_cache *s)return slab_kset; } -#define ID_STR_LENGTH 64 +#define ID_STR_LENGTH 32/* Create a unique string id for a slab cache: * @@ -5924,9 +5924,12 @@ static char *create_unique_id(struct kmem_cache *s) *p++ ='A' ;if (p != name +1 ) *p++ ='-' ; - p +=sprintf (p,"%07u" , s->size); + p +=snprintf (p,ID_STR_LENGTH - (p - name),"%07u" , s->size); -BUG_ON (p > name +ID_STR_LENGTH -1 ); +if (WARN_ON (p > name +ID_STR_LENGTH -1 )) { +kfree (name); +return ERR_PTR (-EINVAL ); + }return name; }