summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Ian King <colin.king@canonical.com>2020-01-14 14:54:48 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-01-23 08:21:35 +0100
commitc91e8519c67d0e20894751abdb11f8e4dc77ec21 (patch)
tree99a29f0b38e237871ec14d1de3a3329943c5e10a
parent6dc2025f3cd9fd65986e0cdf9705a653e05ad486 (diff)
downloadlinux-stable-c91e8519c67d0e20894751abdb11f8e4dc77ec21.tar.gz
linux-stable-c91e8519c67d0e20894751abdb11f8e4dc77ec21.tar.bz2
linux-stable-c91e8519c67d0e20894751abdb11f8e4dc77ec21.zip
net/wan/fsl_ucc_hdlc: fix out of bounds write on array utdm_info
[ Upstream commit ddf420390526ede3b9ff559ac89f58cb59d9db2f ] Array utdm_info is declared as an array of MAX_HDLC_NUM (4) elements however up to UCC_MAX_NUM (8) elements are potentially being written to it. Currently we have an array out-of-bounds write error on the last 4 elements. Fix this by making utdm_info UCC_MAX_NUM elements in size. Addresses-Coverity: ("Out-of-bounds write") Fixes: c19b6d246a35 ("drivers/net: support hdlc function for QE-UCC") Signed-off-by: Colin Ian King <colin.king@canonical.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/net/wan/fsl_ucc_hdlc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wan/fsl_ucc_hdlc.c b/drivers/net/wan/fsl_ucc_hdlc.c
index 0212f576a838..daeab33f623e 100644
--- a/drivers/net/wan/fsl_ucc_hdlc.c
+++ b/drivers/net/wan/fsl_ucc_hdlc.c
@@ -76,7 +76,7 @@ static struct ucc_tdm_info utdm_primary_info = {
},
};
-static struct ucc_tdm_info utdm_info[MAX_HDLC_NUM];
+static struct ucc_tdm_info utdm_info[UCC_MAX_NUM];
static int uhdlc_init(struct ucc_hdlc_private *priv)
{