From: Dean Jenkins <Dean_Jenkins@mentor.com>
To: <netdev@vger.kernel.org>, David Miller <davem@davemloft.net>,
Dean Jenkins <Dean_Jenkins@mentor.com>
Cc: <linux-usb@vger.kernel.org>
Subject: [PATCH V1 1/3] asix: Add rx->ax_skb = NULL after usbnet_skb_return()
Date: Mon, 7 Aug 2017 09:50:14 +0100 [thread overview]
Message-ID: <1502095816-3255-2-git-send-email-Dean_Jenkins@mentor.com> (raw)
In-Reply-To: <1502095816-3255-1-git-send-email-Dean_Jenkins@mentor.com>
In asix_rx_fixup_internal() there is a risk that rx->ax_skb gets
reused after passing the Ethernet frame into the network stack via
usbnet_skb_return().
The risks include:
a) asynchronously freeing rx->ax_skb after passing the netdev buffer
to the NAPI layer which might corrupt the backlog queue.
b) erroneously reusing rx->ax_skb such as calling skb_put_data() multiple
times which causes writing off the end of the netdev buffer.
Therefore add a defensive rx->ax_skb = NULL after usbnet_skb_return()
so that it is not possible to free rx->ax_skb or to apply
skb_put_data() too many times.
Signed-off-by: Dean Jenkins <Dean_Jenkins@mentor.com>
---
drivers/net/usb/asix_common.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/net/usb/asix_common.c b/drivers/net/usb/asix_common.c
index 7847436..6983b6b 100644
--- a/drivers/net/usb/asix_common.c
+++ b/drivers/net/usb/asix_common.c
@@ -168,8 +168,10 @@ int asix_rx_fixup_internal(struct usbnet *dev, struct sk_buff *skb,
if (rx->ax_skb) {
skb_put_data(rx->ax_skb, skb->data + offset,
copy_length);
- if (!rx->remaining)
+ if (!rx->remaining) {
usbnet_skb_return(dev, rx->ax_skb);
+ rx->ax_skb = NULL;
+ }
}
offset += (copy_length + 1) & 0xfffe;
--
2.7.4
next prev parent reply other threads:[~2017-08-07 8:50 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-07 8:50 [PATCH V1 0/3] asix: Improve robustness Dean Jenkins
2017-08-07 8:50 ` Dean Jenkins [this message]
2017-08-07 8:50 ` [PATCH V1 2/3] asix: Ensure asix_rx_fixup_info members are all reset Dean Jenkins
2017-08-07 8:50 ` [PATCH V1 3/3] asix: Fix small memory leak in ax88772_unbind() Dean Jenkins
2017-08-07 17:11 ` [PATCH V1 0/3] asix: Improve robustness David Miller
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=1502095816-3255-2-git-send-email-Dean_Jenkins@mentor.com \
--to=dean_jenkins@mentor.com \
--cc=davem@davemloft.net \
--cc=linux-usb@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).