|
@@ -488,15 +488,16 @@ static int __decode_pool_names(void **p, void *end, struct ceph_osdmap *map)
|
|
|
ceph_decode_32_safe(p, end, pool, bad);
|
|
|
ceph_decode_32_safe(p, end, len, bad);
|
|
|
dout(" pool %d len %d\n", pool, len);
|
|
|
+ ceph_decode_need(p, end, len, bad);
|
|
|
pi = __lookup_pg_pool(&map->pg_pools, pool);
|
|
|
if (pi) {
|
|
|
+ char *name = kstrndup(*p, len, GFP_NOFS);
|
|
|
+
|
|
|
+ if (!name)
|
|
|
+ return -ENOMEM;
|
|
|
kfree(pi->name);
|
|
|
- pi->name = kmalloc(len + 1, GFP_NOFS);
|
|
|
- if (pi->name) {
|
|
|
- memcpy(pi->name, *p, len);
|
|
|
- pi->name[len] = '\0';
|
|
|
- dout(" name is %s\n", pi->name);
|
|
|
- }
|
|
|
+ pi->name = name;
|
|
|
+ dout(" name is %s\n", pi->name);
|
|
|
}
|
|
|
*p += len;
|
|
|
}
|