AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2025-03-04 18:06:48 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

libceph: fix decoding of pgids

Browse Source 
In 4f6a7e5ee1 we effectively dropped support
for the legacy encoding for the OSDMap and incremental.  However, we didn't
fix the decoding for the pgid.

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
This commit is contained in:
Sage Weil 2013-03-06 14:57:03 -08:00
parent 83ca14fdd3
commit d6c0dd6b0c
1 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
net/ceph/osdmap.c
View File

@ -654,6 +654,24 @@ static int osdmap_set_max_osd(struct ceph_osdmap *map, int max)
return 0; return 0;
} }
static int __decode_pgid(void **p, void *end, struct ceph_pg *pg)
{
u8 v;
ceph_decode_need(p, end, 1+8+4+4, bad);
v = ceph_decode_8(p);
if (v != 1)
goto bad;
pg->pool = ceph_decode_64(p);
pg->seed = ceph_decode_32(p);
*p += 4; /* skip preferred */
return 0;
bad:
dout("error decoding pgid\n");
return -EINVAL;
}
/* /*
* decode a full map. * decode a full map.
*/ */
@ -745,13 +763,12 @@ struct ceph_osdmap *osdmap_decode(void **p, void *end)
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
int n, j; int n, j;
struct ceph_pg pgid; struct ceph_pg pgid;
struct ceph_pg_v1 pgid_v1;
struct ceph_pg_mapping *pg; struct ceph_pg_mapping *pg;
ceph_decode_need(p, end, sizeof(u32) + sizeof(u64), bad); err = __decode_pgid(p, end, &pgid);
ceph_decode_copy(p, &pgid_v1, sizeof(pgid_v1)); if (err)
pgid.pool = le32_to_cpu(pgid_v1.pool); goto bad;
pgid.seed = le16_to_cpu(pgid_v1.ps); ceph_decode_need(p, end, sizeof(u32), bad);
n = ceph_decode_32(p); n = ceph_decode_32(p);
err = -EINVAL; err = -EINVAL;
if (n > (UINT_MAX - sizeof(*pg)) / sizeof(u32)) if (n > (UINT_MAX - sizeof(*pg)) / sizeof(u32))
@ -818,8 +835,8 @@ struct ceph_osdmap *osdmap_apply_incremental(void **p, void *end,
u16 version; u16 version;
ceph_decode_16_safe(p, end, version, bad); ceph_decode_16_safe(p, end, version, bad);
if (version > 6) { if (version != 6) {
pr_warning("got unknown v %d > %d of inc osdmap\n", version, 6); pr_warning("got unknown v %d != 6 of inc osdmap\n", version);
goto bad; goto bad;
} }
@ -963,15 +980,14 @@ struct ceph_osdmap *osdmap_apply_incremental(void **p, void *end,
while (len--) { while (len--) {
struct ceph_pg_mapping *pg; struct ceph_pg_mapping *pg;
int j; int j;
struct ceph_pg_v1 pgid_v1;
struct ceph_pg pgid; struct ceph_pg pgid;
u32 pglen; u32 pglen;
ceph_decode_need(p, end, sizeof(u64) + sizeof(u32), bad);
ceph_decode_copy(p, &pgid_v1, sizeof(pgid_v1));
pgid.pool = le32_to_cpu(pgid_v1.pool);
pgid.seed = le16_to_cpu(pgid_v1.ps);
pglen = ceph_decode_32(p);
err = __decode_pgid(p, end, &pgid);
if (err)
goto bad;
ceph_decode_need(p, end, sizeof(u32), bad);
pglen = ceph_decode_32(p);
if (pglen) { if (pglen) {
ceph_decode_need(p, end, pglen*sizeof(u32), bad); ceph_decode_need(p, end, pglen*sizeof(u32), bad);