diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2017-05-23 17:25:10 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-04-13 20:52:14 +0300 |
| commit | c5ca1641274a023a34a4e3b022b68c0728c41bd0 (patch) | |
| tree | 4859c8bc7f9acc73aaacc8387c2ce5fbd797a621 /net/ceph | |
| parent | 42469a9e2b152094ffabf3a9d534e4e24036cf9d (diff) | |
| download | linux-c5ca1641274a023a34a4e3b022b68c0728c41bd0.tar.xz | |
libceph: NULL deref on crush_decode() error path
[ Upstream commit 293dffaad8d500e1a5336eeb90d544cf40d4fbd8 ]
If there is not enough space then ceph_decode_32_safe() does a goto bad.
We need to return an error code in that situation. The current code
returns ERR_PTR(0) which is NULL. The callers are not expecting that
and it results in a NULL dereference.
Fixes: f24e9980eb86 ("ceph: OSD client")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/ceph')
| -rw-r--r-- | net/ceph/osdmap.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ceph/osdmap.c b/net/ceph/osdmap.c index 8bb2e0c1cb50..c2f815d44914 100644 --- a/net/ceph/osdmap.c +++ b/net/ceph/osdmap.c @@ -270,6 +270,7 @@ static struct crush_map *crush_decode(void *pbyval, void *end) u32 yes; struct crush_rule *r; + err = -EINVAL; ceph_decode_32_safe(p, end, yes, bad); if (!yes) { dout("crush_decode NO rule %d off %x %p to %p\n", |