Netdev Archive on lore.kernel.org help / color / mirror / Atom feed
From: Dan Carpenter <dan.carpenter@oracle.com> To: M Chetan Kumar <m.chetan.kumar@intel.com>, Solomon Ucko <solly.ucko@gmail.com> Cc: Intel Corporation <linuxwwan@intel.com>, Loic Poulain <loic.poulain@linaro.org>, Sergey Ryazanov <ryazanov.s.a@gmail.com>, Johannes Berg <johannes@sipsolutions.net>, "David S. Miller" <davem@davemloft.net>, Jakub Kicinski <kuba@kernel.org>, netdev@vger.kernel.org, security@kernel.org Subject: [PATCH net] net: iosm: Prevent underflow in ipc_chnl_cfg_get() Date: Mon, 16 Aug 2021 12:26:10 +0300 [thread overview] Message-ID: <20210816092610.GA26746@kili> (raw) In-Reply-To: <CANtMP6qvcE+u61+HUyEFNu15kQ02a1P5_mGRSHuyeCxkf4pQbA@mail.gmail.com> The bounds check on "index" doesn't catch negative values. Using ARRAY_SIZE() directly is more readable and more robust because it prevents negative values for "index". Fortunately we only pass valid values to ipc_chnl_cfg_get() so this patch does not affect runtime. Reported-by: Solomon Ucko <solly.ucko@gmail.com> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> --- I suspect this is bug report was based on static analysis. I had a Smatch check that used to print a warning, but then I modified it to only complain when the index was user controlled. drivers/net/wwan/iosm/iosm_ipc_chnl_cfg.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/net/wwan/iosm/iosm_ipc_chnl_cfg.c b/drivers/net/wwan/iosm/iosm_ipc_chnl_cfg.c index 804e6c4f2c78..016c9c3aea8e 100644 --- a/drivers/net/wwan/iosm/iosm_ipc_chnl_cfg.c +++ b/drivers/net/wwan/iosm/iosm_ipc_chnl_cfg.c @@ -64,10 +64,9 @@ static struct ipc_chnl_cfg modem_cfg[] = { int ipc_chnl_cfg_get(struct ipc_chnl_cfg *chnl_cfg, int index) { - int array_size = ARRAY_SIZE(modem_cfg); - - if (index >= array_size) { - pr_err("index: %d and array_size %d", index, array_size); + if (index >= ARRAY_SIZE(modem_cfg)) { + pr_err("index: %d and array_size %lu", index, + ARRAY_SIZE(modem_cfg)); return -ECHRNG; } -- 2.20.1
next parent reply other threads:[~2021-08-16 9:26 UTC|newest] Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top [not found] <CANtMP6qvcE+u61+HUyEFNu15kQ02a1P5_mGRSHuyeCxkf4pQbA@mail.gmail.com> 2021-08-16 9:26 ` Dan Carpenter [this message] 2021-08-16 10:48 ` [PATCH net] net: iosm: Prevent underflow in ipc_chnl_cfg_get() Kumar, M Chetan 2021-08-16 11:13 ` [PATCH v2 " Dan Carpenter 2021-08-16 12:17 ` Kumar, M Chetan 2021-08-16 12:50 ` patchwork-bot+netdevbpf
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=20210816092610.GA26746@kili \ --to=dan.carpenter@oracle.com \ --cc=davem@davemloft.net \ --cc=johannes@sipsolutions.net \ --cc=kuba@kernel.org \ --cc=linuxwwan@intel.com \ --cc=loic.poulain@linaro.org \ --cc=m.chetan.kumar@intel.com \ --cc=netdev@vger.kernel.org \ --cc=ryazanov.s.a@gmail.com \ --cc=security@kernel.org \ --cc=solly.ucko@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe 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; as well as URLs for NNTP newsgroup(s).