Skip to content

Commit

Permalink
libceph: fix a use after free issue in osdmap_set_max_osd
Browse files Browse the repository at this point in the history
If the state variable is krealloced successfully, map->osd_state will be
freed, once following two reallocation failed, and exit the function
without resetting map->osd_state, map->osd_state become a wild pointer.

fix it by resetting them after krealloc successfully.

Signed-off-by: Li RongQing <[email protected]>
Signed-off-by: Ilya Dryomov <[email protected]>
  • Loading branch information
Li RongQing authored and idryomov committed Oct 14, 2014
1 parent dc220db commit 589506f
Showing 1 changed file with 16 additions and 16 deletions.
32 changes: 16 additions & 16 deletions net/ceph/osdmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -671,38 +671,38 @@ static int osdmap_set_max_osd(struct ceph_osdmap *map, int max)
int i;

state = krealloc(map->osd_state, max*sizeof(*state), GFP_NOFS);
if (!state)
return -ENOMEM;
map->osd_state = state;

weight = krealloc(map->osd_weight, max*sizeof(*weight), GFP_NOFS);
addr = krealloc(map->osd_addr, max*sizeof(*addr), GFP_NOFS);
if (!state || !weight || !addr) {
kfree(state);
kfree(weight);
kfree(addr);
if (!weight)
return -ENOMEM;
map->osd_weight = weight;

addr = krealloc(map->osd_addr, max*sizeof(*addr), GFP_NOFS);
if (!addr)
return -ENOMEM;
}
map->osd_addr = addr;

for (i = map->max_osd; i < max; i++) {
state[i] = 0;
weight[i] = CEPH_OSD_OUT;
memset(addr + i, 0, sizeof(*addr));
map->osd_state[i] = 0;
map->osd_weight[i] = CEPH_OSD_OUT;
memset(map->osd_addr + i, 0, sizeof(*map->osd_addr));
}

map->osd_state = state;
map->osd_weight = weight;
map->osd_addr = addr;

if (map->osd_primary_affinity) {
u32 *affinity;

affinity = krealloc(map->osd_primary_affinity,
max*sizeof(*affinity), GFP_NOFS);
if (!affinity)
return -ENOMEM;
map->osd_primary_affinity = affinity;

for (i = map->max_osd; i < max; i++)
affinity[i] = CEPH_OSD_DEFAULT_PRIMARY_AFFINITY;

map->osd_primary_affinity = affinity;
map->osd_primary_affinity[i] =
CEPH_OSD_DEFAULT_PRIMARY_AFFINITY;
}

map->max_osd = max;
Expand Down

0 comments on commit 589506f

Please sign in to comment.