diff options
| author | Ilya Dryomov <idryomov@gmail.com> | 2015-06-29 19:30:23 +0300 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-08-04 16:52:26 +0200 |
| commit | 85a5064b5c4fa42a2bd73feba46a5f96f56edabe (patch) | |
| tree | e8481b3fb7cf8fb9885ec02418ec82b54769de70 | |
| parent | 41e8d434d480fbf5385035aa800d4f0db67b8ecd (diff) | |
| download | lwn-85a5064b5c4fa42a2bd73feba46a5f96f56edabe.tar.gz lwn-85a5064b5c4fa42a2bd73feba46a5f96f56edabe.zip | |
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: Jiri Slaby <jslaby@suse.cz>
| -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 dbd9a4792427..7ec4e0522215 100644 --- a/net/ceph/osdmap.c +++ b/net/ceph/osdmap.c @@ -89,7 +89,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; |