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

tehcaster · tehcaster · commit 0bdcef54a25b · 2022-09-29T11:27:58.000+02:00
Additional cleanup by Chao Yu removing a BUG_ON() in create_unique_id().
diff --git a/mm/slub.c b/mm/slub.c
@@ -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;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -5751,7 +5751,7 @@ static inline struct kset cache_kset(struct kmem_cache s)`
`5751`	`5751`	`return slab_kset;`
`5752`	`5752`	`}`
`5753`	`5753`
`5754`		`-#define ID_STR_LENGTH 64`
	`5754`	`+#define ID_STR_LENGTH 32`
`5755`	`5755`
`5756`	`5756`	`/* Create a unique string id for a slab cache:`
`5757`	`5757`	`*`
`@@ -5785,9 +5785,12 @@ static char create_unique_id(struct kmem_cache s)`
`5785`	`5785`	`*p++ = 'A';`
`5786`	`5786`	`if (p != name + 1)`
`5787`	`5787`	`*p++ = '-';`
`5788`		`- p += sprintf(p, "%07u", s->size);`
	`5788`	`+ p += snprintf(p, ID_STR_LENGTH - (p - name), "%07u", s->size);`
`5789`	`5789`
`5790`		`- BUG_ON(p > name + ID_STR_LENGTH - 1);`
	`5790`	`+ if (WARN_ON(p > name + ID_STR_LENGTH - 1)) {`
	`5791`	`+ kfree(name);`
	`5792`	`+ return ERR_PTR(-EINVAL);`
	`5793`	`+ }`
`5791`	`5794`	`return name;`
`5792`	`5795`	`}`
`5793`	`5796`