iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'slab/for-6.1/trivial' into slab/for-next

Browse Source 
Additional cleanup by Chao Yu removing a BUG_ON() in create_unique_id().
This commit is contained in:
Vlastimil Babka 2022-09-29 11:27:58 +02:00
commit 0bdcef54a2
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mm/slub.c
View File

@ -5751,7 +5751,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:
*
@ -5785,9 +5785,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;
}