From: Sasha Levin <sashal@kernel•org>
To: linux-kernel@vger•kernel.org, stable@vger•kernel.org
Cc: Rasmus Villemoes <linux@rasmusvillemoes•dk>,
Qiang Zhao <qiang.zhao@nxp•com>, Timur Tabi <timur@kernel•org>,
"David S . Miller" <davem@davemloft•net>,
Li Yang <leoyang.li@nxp•com>, Sasha Levin <sashal@kernel•org>,
netdev@vger•kernel.org, linuxppc-dev@lists•ozlabs.org
Subject: [PATCH AUTOSEL 4.9 049/141] net/wan/fsl_ucc_hdlc: reject muram offsets above 64K
Date: Fri, 14 Feb 2020 11:19:49 -0500 [thread overview]
Message-ID: <20200214162122.19794-49-sashal@kernel.org> (raw)
In-Reply-To: <20200214162122.19794-1-sashal@kernel.org>
From: Rasmus Villemoes <linux@rasmusvillemoes•dk>
[ Upstream commit 148587a59f6b85831695e0497d9dd1af5f0495af ]
Qiang Zhao points out that these offsets get written to 16-bit
registers, and there are some QE platforms with more than 64K
muram. So it is possible that qe_muram_alloc() gives us an allocation
that can't actually be used by the hardware, so detect and reject
that.
Reported-by: Qiang Zhao <qiang.zhao@nxp•com>
Reviewed-by: Timur Tabi <timur@kernel•org>
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes•dk>
Acked-by: David S. Miller <davem@davemloft•net>
Signed-off-by: Li Yang <leoyang.li@nxp•com>
Signed-off-by: Sasha Levin <sashal@kernel•org>
---
drivers/net/wan/fsl_ucc_hdlc.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/net/wan/fsl_ucc_hdlc.c b/drivers/net/wan/fsl_ucc_hdlc.c
index af85a1b3135e2..87bf05a81db50 100644
--- a/drivers/net/wan/fsl_ucc_hdlc.c
+++ b/drivers/net/wan/fsl_ucc_hdlc.c
@@ -209,6 +209,11 @@ static int uhdlc_init(struct ucc_hdlc_private *priv)
ret = -ENOMEM;
goto free_riptr;
}
+ if (riptr != (u16)riptr || tiptr != (u16)tiptr) {
+ dev_err(priv->dev, "MURAM allocation out of addressable range\n");
+ ret = -ENOMEM;
+ goto free_tiptr;
+ }
/* Set RIPTR, TIPTR */
iowrite16be(riptr, &priv->ucc_pram->riptr);
--
2.20.1
next prev parent reply other threads:[~2020-02-14 16:41 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20200214162122.19794-1-sashal@kernel.org>
2020-02-14 16:19 ` [PATCH AUTOSEL 4.9 006/141] brcmfmac: Fix use after free in brcmf_sdio_readframes() Sasha Levin
2020-02-14 16:19 ` [PATCH AUTOSEL 4.9 007/141] gianfar: Fix TX timestamping with a stacked DSA driver Sasha Levin
2020-02-14 16:19 ` [PATCH AUTOSEL 4.9 028/141] libertas: don't exit from lbs_ibss_join_existing() with RCU read lock held Sasha Levin
2020-02-14 16:19 ` [PATCH AUTOSEL 4.9 029/141] libertas: make lbs_ibss_join_existing() return error code on rates overflow Sasha Levin
2020-02-14 16:19 ` Sasha Levin [this message]
2020-02-14 16:19 ` [PATCH AUTOSEL 4.9 051/141] NFC: port100: Convert cpu_to_le16(le16_to_cpu(E1) + E2) to use le16_add_cpu() Sasha Levin
2020-02-14 16:19 ` [PATCH AUTOSEL 4.9 058/141] isdn: don't mark kcapi_proc_exit as __exit Sasha Levin
2020-02-14 16:20 ` [PATCH AUTOSEL 4.9 061/141] b43legacy: Fix -Wcast-function-type Sasha Levin
2020-02-14 16:20 ` [PATCH AUTOSEL 4.9 062/141] ipw2x00: " Sasha Levin
2020-02-14 16:20 ` [PATCH AUTOSEL 4.9 063/141] iwlegacy: " Sasha Levin
2020-02-14 16:20 ` [PATCH AUTOSEL 4.9 064/141] rtlwifi: rtl_pci: " Sasha Levin
2020-02-14 16:20 ` [PATCH AUTOSEL 4.9 066/141] orinoco: avoid assertion in case of NULL pointer Sasha Levin
2020-02-14 16:20 ` [PATCH AUTOSEL 4.9 072/141] net/wan/fsl_ucc_hdlc: remove set but not used variables 'ut_info' and 'ret' Sasha Levin
2020-02-14 16:20 ` [PATCH AUTOSEL 4.9 079/141] tools lib api fs: Fix gcc9 stringop-truncation compilation error Sasha Levin
2020-02-14 16:20 ` [PATCH AUTOSEL 4.9 089/141] wan: ixp4xx_hss: fix compile-testing on 64-bit Sasha Levin
2020-02-14 16:20 ` [PATCH AUTOSEL 4.9 118/141] hostap: Adjust indentation in prism2_hostapd_add_sta Sasha Levin
2020-02-14 16:20 ` [PATCH AUTOSEL 4.9 119/141] rtlwifi: rtl8821ae: remove unused variables Sasha Levin
2020-02-14 16:21 ` [PATCH AUTOSEL 4.9 120/141] rtlwifi: rtl8192ee: " Sasha Levin
2020-02-14 16:21 ` [PATCH AUTOSEL 4.9 121/141] rtlwifi: rtl8723ae: " Sasha Levin
2020-02-14 16:21 ` [PATCH AUTOSEL 4.9 122/141] iwlegacy: ensure loop counter addr does not wrap and cause an infinite loop Sasha Levin
2020-02-14 16:21 ` [PATCH AUTOSEL 4.9 124/141] mwifiex: Fix possible buffer overflows in mwifiex_ret_wmm_get_status() Sasha Levin
2020-02-14 16:21 ` [PATCH AUTOSEL 4.9 125/141] mwifiex: Fix possible buffer overflows in mwifiex_cmd_append_vsie_tlv() Sasha Levin
2020-02-14 16:21 ` [PATCH AUTOSEL 4.9 137/141] iwlwifi: mvm: Fix thermal zone registration Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200214162122.19794-49-sashal@kernel.org \
--to=sashal@kernel$(echo .)org \
--cc=davem@davemloft$(echo .)net \
--cc=leoyang.li@nxp$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux@rasmusvillemoes$(echo .)dk \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=qiang.zhao@nxp$(echo .)com \
--cc=stable@vger$(echo .)kernel.org \
--cc=timur@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox