GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-04-02 20:44:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

libceph: simplify ceph_monc_handle_map()

Browse source 
ceph_monc_handle_map() confuses static checkers which report a
false use-after-free on monc->monmap, missing that monc->monmap and
client->monc.monmap is the same pointer.

Use monc->monmap consistently and get rid of "old", which is redundant.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
This commit is contained in:
Ilya Dryomov 2020-02-26 16:37:55 +01:00
parent 8ccf7fcce1
commit 4d8b8fb494
1 changed files with 4 additions and 4 deletions

8
net/ceph/mon_client.c
View file

@ -467,7 +467,7 @@ static void ceph_monc_handle_map(struct ceph_mon_client *monc,
struct ceph_msg *msg) struct ceph_msg *msg)
{ {
struct ceph_client *client = monc->client; struct ceph_client *client = monc->client;
struct ceph_monmap *monmap = NULL, *old = monc->monmap; struct ceph_monmap *monmap;
void *p, *end; void *p, *end;
mutex_lock(&monc->mutex); mutex_lock(&monc->mutex);
@ -484,13 +484,13 @@ static void ceph_monc_handle_map(struct ceph_mon_client *monc,
goto out; goto out;
} }
if (ceph_check_fsid(monc->client, &monmap->fsid) < 0) { if (ceph_check_fsid(client, &monmap->fsid) < 0) {
kfree(monmap); kfree(monmap);
goto out; goto out;
} }
client->monc.monmap = monmap; kfree(monc->monmap);
kfree(old); monc->monmap = monmap;
__ceph_monc_got_map(monc, CEPH_SUB_MONMAP, monc->monmap->epoch); __ceph_monc_got_map(monc, CEPH_SUB_MONMAP, monc->monmap->epoch);
client->have_fsid = true; client->have_fsid = true;