From: Aymen Qader <qader.aymen@gmail.com>
To: Wolfram Sang <wsa@the-dreams.de>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v3] staging: ks7010: Add null pointer check for skb
Date: Thu, 27 Sep 2018 19:04:43 +0100 [thread overview]
Message-ID: <20180927180443.yjqycqa7jir6rb57@localhost.localdomain> (raw)
In-Reply-To: <20180927151614.25470-1-qader.aymen@gmail.com>
Retraction: in hindsight I see that with the current usage of this
function, there is already a check for the socket buffer so this check
is unnecessary. However, I'm not sure if it's considered good practice
to keep this check anyway--in any case, ENOMEM isn't the right error
to return.
On Thu, Sep 27, 2018 at 04:16:13PM +0100, Aymen Qader wrote:
> Add a null pointer check for the socket buffer in ks_hostif.c to avoid a
> possible null pointer deference, and remove a later now-redundant null
> pointer check.
>
> Signed-off-by: Aymen Qader <qader.aymen@gmail.com>
> ---
> v2: Remove redundant pointer check
> v3: Style fix
>
> drivers/staging/ks7010/ks_hostif.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/staging/ks7010/ks_hostif.c b/drivers/staging/ks7010/ks_hostif.c
> index 0e554e3359b5..95b6c7557e84 100644
> --- a/drivers/staging/ks7010/ks_hostif.c
> +++ b/drivers/staging/ks7010/ks_hostif.c
> @@ -1011,6 +1011,11 @@ int hostif_data_request(struct ks_wlan_private *priv, struct sk_buff *skb)
> size_t size;
> int ret;
>
> + if (!skb) {
> + ret = -ENOMEM;
> + goto err_kfree;
> + }
> +
> skb_len = skb->len;
> if (skb_len > ETH_FRAME_LEN) {
> netdev_err(priv->net_dev, "bad length skb_len=%d\n", skb_len);
> @@ -1023,7 +1028,6 @@ int hostif_data_request(struct ks_wlan_private *priv, struct sk_buff *skb)
> priv->wpa.mic_failure.stop) {
> if (netif_queue_stopped(priv->net_dev))
> netif_wake_queue(priv->net_dev);
> - if (skb)
> dev_kfree_skb(skb);
>
> return 0;
> --
> 2.17.1
>
next prev parent reply other threads:[~2018-09-27 18:04 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-27 15:16 Aymen Qader
2018-09-27 18:04 ` Aymen Qader [this message]
2018-09-28 8:22 ` Dan Carpenter
2018-09-28 8:13 ` Dan Carpenter
2018-09-28 8:16 ` Dan Carpenter
2018-09-28 8:48 ` Aymen Qader
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=20180927180443.yjqycqa7jir6rb57@localhost.localdomain \
--to=qader.aymen@gmail.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=wsa@the-dreams.de \
/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: link
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
all inboxes | Powered by JetHome®