diff options
| author | Ilya Dryomov <idryomov@gmail.com> | 2015-06-29 19:30:23 +0300 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-08-12 16:33:18 +0200 |
| commit | f34a986bb4e1f8a97437bf68194297822d5b1fb4 (patch) | |
| tree | 816e906f9ae382e55c25dd24b2ddfa687b8af890 /net | |
| parent | 3e05b16a56a9ffc6cd01d155c8599df7d17a8893 (diff) | |
| download | kernel_samsung_smdk4412-f34a986bb4e1f8a97437bf68194297822d5b1fb4.zip kernel_samsung_smdk4412-f34a986bb4e1f8a97437bf68194297822d5b1fb4.tar.gz kernel_samsung_smdk4412-f34a986bb4e1f8a97437bf68194297822d5b1fb4.tar.bz2 | |
crush: fix a bug in tree bucket decode
commit 82cd003a77173c91b9acad8033fb7931dac8d751 upstream.
struct crush_bucket_tree::num_nodes is u8, so ceph_decode_8_safe()
should be used. -Wconversion catches this, but I guess it went
unnoticed in all the noise it spews. The actual problem (at least for
common crushmaps) isn't the u32 -> u8 truncation though - it's the
advancement by 4 bytes instead of 1 in the crushmap buffer.
Fixes: http://tracker.ceph.com/issues/2759
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ceph/osdmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ceph/osdmap.c b/net/ceph/osdmap.c index fd863fe..bb38a3c 100644 --- a/net/ceph/osdmap.c +++ b/net/ceph/osdmap.c @@ -102,7 +102,7 @@ static int crush_decode_tree_bucket(void **p, void *end, { int j; dout("crush_decode_tree_bucket %p to %p\n", *p, end); - ceph_decode_32_safe(p, end, b->num_nodes, bad); + ceph_decode_8_safe(p, end, b->num_nodes, bad); b->node_weights = kcalloc(b->num_nodes, sizeof(u32), GFP_NOFS); if (b->node_weights == NULL) return -ENOMEM; |