summaryrefslogtreecommitdiffstats
path: root/net/6lowpan
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2019-04-03 08:34:16 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-01-29 10:21:42 +0100
commit4271d07335ff71bc6e0f257b73221d08cd3ecb09 (patch)
tree21b995a4248e481449e5852b6f6657a872d3441e /net/6lowpan
parentad584317ddab405113663e13b322ff91e1e67ddd (diff)
downloadlinux-stable-4271d07335ff71bc6e0f257b73221d08cd3ecb09.tar.gz
linux-stable-4271d07335ff71bc6e0f257b73221d08cd3ecb09.tar.bz2
linux-stable-4271d07335ff71bc6e0f257b73221d08cd3ecb09.zip
6lowpan: Off by one handling ->nexthdr
[ Upstream commit f57c4bbf34439531adccd7d3a4ecc14f409c1399 ] NEXTHDR_MAX is 255. What happens here is that we take a u8 value "hdr->nexthdr" from the network and then look it up in lowpan_nexthdr_nhcs[]. The problem is that if hdr->nexthdr is 0xff then we read one element beyond the end of the array so the array needs to be one element larger. Fixes: 92aa7c65d295 ("6lowpan: add generic nhc layer interface") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Acked-by: Jukka Rissanen <jukka.rissanen@linux.intel.com> Acked-by: Alexander Aring <aring@mojatatu.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'net/6lowpan')
-rw-r--r--net/6lowpan/nhc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/6lowpan/nhc.c b/net/6lowpan/nhc.c
index 7008d53e455c..e61679bf0908 100644
--- a/net/6lowpan/nhc.c
+++ b/net/6lowpan/nhc.c
@@ -18,7 +18,7 @@
#include "nhc.h"
static struct rb_root rb_root = RB_ROOT;
-static struct lowpan_nhc *lowpan_nexthdr_nhcs[NEXTHDR_MAX];
+static struct lowpan_nhc *lowpan_nexthdr_nhcs[NEXTHDR_MAX + 1];
static DEFINE_SPINLOCK(lowpan_nhc_lock);
static int lowpan_nhc_insert(struct lowpan_nhc *nhc)