From: Greg Kroah-Hartman Date: Mon, 13 Sep 2021 07:46:04 +0000 (+0200) Subject: drop lowpan patch from 4.14 and 4.9 queues X-Git-Tag: v5.4.146~41 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=34f9f14ed5c012c215dab6633d25aead7495645d;p=thirdparty%2Fkernel%2Fstable-queue.git drop lowpan patch from 4.14 and 4.9 queues --- diff --git a/queue-4.14/6lowpan-iphc-fix-an-off-by-one-check-of-array-index.patch b/queue-4.14/6lowpan-iphc-fix-an-off-by-one-check-of-array-index.patch deleted file mode 100644 index 5c829400410..00000000000 --- a/queue-4.14/6lowpan-iphc-fix-an-off-by-one-check-of-array-index.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 615a22f7fe352da25764366e14f43060965dccdd Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 12 Jul 2021 13:14:40 +0100 -Subject: 6lowpan: iphc: Fix an off-by-one check of array index - -From: Colin Ian King - -[ Upstream commit 9af417610b6142e826fd1ee8ba7ff3e9a2133a5a ] - -The bounds check of id is off-by-one and the comparison should -be >= rather >. Currently the WARN_ON_ONCE check does not stop -the out of range indexing of &ldev->ctx.table[id] so also add -a return path if the bounds are out of range. - -Addresses-Coverity: ("Illegal address computation"). -Fixes: 5609c185f24d ("6lowpan: iphc: add support for stateful compression") -Signed-off-by: Colin Ian King -Signed-off-by: Marcel Holtmann -Signed-off-by: Sasha Levin ---- - net/6lowpan/debugfs.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/net/6lowpan/debugfs.c b/net/6lowpan/debugfs.c -index 24915e0bb9ea..2a05c5b5005b 100644 ---- a/net/6lowpan/debugfs.c -+++ b/net/6lowpan/debugfs.c -@@ -176,7 +176,8 @@ static int lowpan_dev_debugfs_ctx_init(struct net_device *dev, - struct dentry *dentry, *root; - char buf[32]; - -- WARN_ON_ONCE(id > LOWPAN_IPHC_CTX_TABLE_SIZE); -+ if (WARN_ON_ONCE(id >= LOWPAN_IPHC_CTX_TABLE_SIZE)) -+ return; - - sprintf(buf, "%d", id); - --- -2.30.2 - diff --git a/queue-4.14/series b/queue-4.14/series index 9704319e7bf..af9d713844a 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -55,7 +55,6 @@ media-dvb-usb-fix-uninit-value-in-dvb_usb_adapter_dv.patch media-dvb-usb-fix-uninit-value-in-vp702x_read_mac_ad.patch media-go7007-remove-redundant-initialization.patch bluetooth-sco-prevent-information-leak-in-sco_conn_d.patch -6lowpan-iphc-fix-an-off-by-one-check-of-array-index.patch tcp-seq_file-avoid-skipping-sk-during-tcp_seek_last_.patch net-cipso-fix-warnings-in-netlbl_cipsov4_add_std.patch i2c-highlander-add-irq-check.patch diff --git a/queue-4.9/6lowpan-iphc-fix-an-off-by-one-check-of-array-index.patch b/queue-4.9/6lowpan-iphc-fix-an-off-by-one-check-of-array-index.patch deleted file mode 100644 index ca024e040d9..00000000000 --- a/queue-4.9/6lowpan-iphc-fix-an-off-by-one-check-of-array-index.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 68c66a31cc9a38a26a89f9594945390a09355728 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 12 Jul 2021 13:14:40 +0100 -Subject: 6lowpan: iphc: Fix an off-by-one check of array index - -From: Colin Ian King - -[ Upstream commit 9af417610b6142e826fd1ee8ba7ff3e9a2133a5a ] - -The bounds check of id is off-by-one and the comparison should -be >= rather >. Currently the WARN_ON_ONCE check does not stop -the out of range indexing of &ldev->ctx.table[id] so also add -a return path if the bounds are out of range. - -Addresses-Coverity: ("Illegal address computation"). -Fixes: 5609c185f24d ("6lowpan: iphc: add support for stateful compression") -Signed-off-by: Colin Ian King -Signed-off-by: Marcel Holtmann -Signed-off-by: Sasha Levin ---- - net/6lowpan/debugfs.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/net/6lowpan/debugfs.c b/net/6lowpan/debugfs.c -index 24915e0bb9ea..2a05c5b5005b 100644 ---- a/net/6lowpan/debugfs.c -+++ b/net/6lowpan/debugfs.c -@@ -176,7 +176,8 @@ static int lowpan_dev_debugfs_ctx_init(struct net_device *dev, - struct dentry *dentry, *root; - char buf[32]; - -- WARN_ON_ONCE(id > LOWPAN_IPHC_CTX_TABLE_SIZE); -+ if (WARN_ON_ONCE(id >= LOWPAN_IPHC_CTX_TABLE_SIZE)) -+ return; - - sprintf(buf, "%d", id); - --- -2.30.2 - diff --git a/queue-4.9/series b/queue-4.9/series index b99d4937c8b..ea5dfd6bb14 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -54,7 +54,6 @@ media-dvb-usb-fix-uninit-value-in-dvb_usb_adapter_dv.patch media-dvb-usb-fix-uninit-value-in-vp702x_read_mac_ad.patch media-go7007-remove-redundant-initialization.patch bluetooth-sco-prevent-information-leak-in-sco_conn_d.patch -6lowpan-iphc-fix-an-off-by-one-check-of-array-index.patch tcp-seq_file-avoid-skipping-sk-during-tcp_seek_last_.patch net-cipso-fix-warnings-in-netlbl_cipsov4_add_std.patch i2c-highlander-add-irq-check.patch