Commit 44065b2e authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Linus Torvalds
Browse files

slub: make ->size unsigned int

Linux doesn't support negative length objects (including meta data).

Link: http://lkml.kernel.org/r/20180305200730.15812-18-adobriyan@gmail.com

Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Acked-by: default avatarChristoph Lameter <cl@linux.com>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: David Rientjes <rientjes@google.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1b473f29
...@@ -84,7 +84,7 @@ struct kmem_cache { ...@@ -84,7 +84,7 @@ struct kmem_cache {
/* Used for retriving partial slabs etc */ /* Used for retriving partial slabs etc */
slab_flags_t flags; slab_flags_t flags;
unsigned long min_partial; unsigned long min_partial;
int size; /* The size of an object including meta data */ unsigned int size; /* The size of an object including meta data */
unsigned int object_size;/* The size of an object without meta data */ unsigned int object_size;/* The size of an object without meta data */
unsigned int offset; /* Free pointer offset. */ unsigned int offset; /* Free pointer offset. */
#ifdef CONFIG_SLUB_CPU_PARTIAL #ifdef CONFIG_SLUB_CPU_PARTIAL
......
...@@ -2399,7 +2399,7 @@ slab_out_of_memory(struct kmem_cache *s, gfp_t gfpflags, int nid) ...@@ -2399,7 +2399,7 @@ slab_out_of_memory(struct kmem_cache *s, gfp_t gfpflags, int nid)
pr_warn("SLUB: Unable to allocate memory on node %d, gfp=%#x(%pGg)\n", pr_warn("SLUB: Unable to allocate memory on node %d, gfp=%#x(%pGg)\n",
nid, gfpflags, &gfpflags); nid, gfpflags, &gfpflags);
pr_warn(" cache: %s, object size: %u, buffer size: %d, default order: %d, min order: %d\n", pr_warn(" cache: %s, object size: %u, buffer size: %u, default order: %d, min order: %d\n",
s->name, s->object_size, s->size, oo_order(s->oo), s->name, s->object_size, s->size, oo_order(s->oo),
oo_order(s->min)); oo_order(s->min));
...@@ -3633,8 +3633,8 @@ static int kmem_cache_open(struct kmem_cache *s, slab_flags_t flags) ...@@ -3633,8 +3633,8 @@ static int kmem_cache_open(struct kmem_cache *s, slab_flags_t flags)
free_kmem_cache_nodes(s); free_kmem_cache_nodes(s);
error: error:
if (flags & SLAB_PANIC) if (flags & SLAB_PANIC)
panic("Cannot create slab %s size=%lu realsize=%u order=%u offset=%u flags=%lx\n", panic("Cannot create slab %s size=%u realsize=%u order=%u offset=%u flags=%lx\n",
s->name, (unsigned long)s->size, s->size, s->name, s->size, s->size,
oo_order(s->oo), s->offset, (unsigned long)flags); oo_order(s->oo), s->offset, (unsigned long)flags);
return -EINVAL; return -EINVAL;
} }
...@@ -3825,7 +3825,7 @@ void __check_heap_object(const void *ptr, unsigned long n, struct page *page, ...@@ -3825,7 +3825,7 @@ void __check_heap_object(const void *ptr, unsigned long n, struct page *page,
bool to_user) bool to_user)
{ {
struct kmem_cache *s; struct kmem_cache *s;
unsigned long offset; unsigned int offset;
size_t object_size; size_t object_size;
/* Find object and usable object size. */ /* Find object and usable object size. */
...@@ -4889,7 +4889,7 @@ struct slab_attribute { ...@@ -4889,7 +4889,7 @@ struct slab_attribute {
static ssize_t slab_size_show(struct kmem_cache *s, char *buf) static ssize_t slab_size_show(struct kmem_cache *s, char *buf)
{ {
return sprintf(buf, "%d\n", s->size); return sprintf(buf, "%u\n", s->size);
} }
SLAB_ATTR_RO(slab_size); SLAB_ATTR_RO(slab_size);
...@@ -5664,7 +5664,7 @@ static char *create_unique_id(struct kmem_cache *s) ...@@ -5664,7 +5664,7 @@ static char *create_unique_id(struct kmem_cache *s)
*p++ = 'A'; *p++ = 'A';
if (p != name + 1) if (p != name + 1)
*p++ = '-'; *p++ = '-';
p += sprintf(p, "%07d", s->size); p += sprintf(p, "%07u", s->size);
BUG_ON(p > name + ID_STR_LENGTH - 1); BUG_ON(p > name + ID_STR_LENGTH - 1);
return name; return name;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment