From: Colin Ian King <colin.king-Z7WLFzj8eWMS+FvcfC7Uqw@public•gmane.org>
To: Jakub Kicinski
<jakub.kicinski-wFxRvT7yatFl57MIdRCFDg@public•gmane.org>,
Lauro Ramos Venancio
<lauro.venancio-430g2QfJUUCGglJvpFV4uA@public•gmane.org>,
Aloisio Almeida Jr
<aloisio.almeida-430g2QfJUUCGglJvpFV4uA@public•gmane.org>,
Samuel Ortiz <sameo-VuQAYsv1563Yd54FQh9/CA@public•gmane.org>,
"David S . Miller"
<davem-fT/PcQaiUtIeIZ0/mPfg9Q@public•gmane.org>,
Rolf Neugebauer
<rolf.neugebauer-wFxRvT7yatFl57MIdRCFDg@public•gmane.org>,
Christophe Ricard
<christophe.ricard-Re5JQEeQqe8AvxtiuMwx3w@public•gmane.org>,
Robert Dolca
<robert.dolca-ral2JQCrhuEAvxtiuMwx3w@public•gmane.org>,
oss-drivers-wFxRvT7yatFl57MIdRCFDg@public•gmane.org,
netdev-u79uwXL29TY76Z2rM5mHXA@public•gmane.org,
linux-wireless-u79uwXL29TY76Z2rM5mHXA@public•gmane.org
Subject: NACK: [PATCH] nfp: check idx is -ENOSPC before using it is an index
Date: Mon, 11 Jul 2016 16:52:02 +0100 [thread overview]
Message-ID: <5783C0A2.2020405@canonical.com> (raw)
In-Reply-To: <1468252017-14864-1-git-send-email-colin.king-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org>
Ignore this, got some other fix included by mistake. Will resend.
On 11/07/16 16:46, Colin King wrote:
> From: Colin Ian King <colin.king-Z7WLFzj8eWMS+FvcfC7Uqw@public•gmane.org>
>
> idx can be returned as -ENOSPC, so we should check for this first
> before using it as an index into nn->vxlan_usecnt[] to avoid an
> out of bounds array offset read.
>
> Signed-off-by: Colin Ian King <colin.king-Z7WLFzj8eWMS+FvcfC7Uqw@public•gmane.org>
> ---
> drivers/net/ethernet/netronome/nfp/nfp_net_common.c | 2 +-
> drivers/nfc/fdp/fdp.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
> index 1e74b91..88678c1 100644
> --- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
> +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
> @@ -2578,7 +2578,7 @@ static void nfp_net_del_vxlan_port(struct net_device *netdev,
> return;
>
> idx = nfp_net_find_vxlan_idx(nn, ti->port);
> - if (!nn->vxlan_usecnt[idx] || idx == -ENOSPC)
> + if (idx == -ENOSPC || !nn->vxlan_usecnt[idx])
> return;
>
> if (!--nn->vxlan_usecnt[idx])
> diff --git a/drivers/nfc/fdp/fdp.c b/drivers/nfc/fdp/fdp.c
> index e44a7a2..d93d314 100644
> --- a/drivers/nfc/fdp/fdp.c
> +++ b/drivers/nfc/fdp/fdp.c
> @@ -345,7 +345,7 @@ static void fdp_nci_release_firmware(struct nci_dev *ndev)
>
> if (info->ram_patch) {
> release_firmware(info->ram_patch);
> - info->otp_patch = NULL;
> + info->ram_patch = NULL;
> }
> }
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public•gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2016-07-11 15:52 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-11 15:46 [PATCH] nfp: check idx is -ENOSPC before using it is an index Colin King
[not found] ` <1468252017-14864-1-git-send-email-colin.king-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org>
2016-07-11 15:52 ` Colin Ian King [this message]
2016-07-11 15:59 ` Samuel Ortiz
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=5783C0A2.2020405@canonical.com \
--to=colin.king-z7wlfzj8ewms+fvcfc7uqw@public$(echo .)gmane.org \
--cc=aloisio.almeida-430g2QfJUUCGglJvpFV4uA@public$(echo .)gmane.org \
--cc=christophe.ricard-Re5JQEeQqe8AvxtiuMwx3w@public$(echo .)gmane.org \
--cc=davem-fT/PcQaiUtIeIZ0/mPfg9Q@public$(echo .)gmane.org \
--cc=jakub.kicinski-wFxRvT7yatFl57MIdRCFDg@public$(echo .)gmane.org \
--cc=lauro.venancio-430g2QfJUUCGglJvpFV4uA@public$(echo .)gmane.org \
--cc=linux-wireless-u79uwXL29TY76Z2rM5mHXA@public$(echo .)gmane.org \
--cc=netdev-u79uwXL29TY76Z2rM5mHXA@public$(echo .)gmane.org \
--cc=oss-drivers-wFxRvT7yatFl57MIdRCFDg@public$(echo .)gmane.org \
--cc=robert.dolca-ral2JQCrhuEAvxtiuMwx3w@public$(echo .)gmane.org \
--cc=rolf.neugebauer-wFxRvT7yatFl57MIdRCFDg@public$(echo .)gmane.org \
--cc=sameo-VuQAYsv1563Yd54FQh9/CA@public$(echo .)gmane.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