From: Eric Dumazet <eric.dumazet@gmail.com>
To: Bogdan Hamciuc <bogdan.hamciuc@freescale.com>
Cc: davem@davemloft.net, netdev@vger.kernel.org
Subject: Re: [PATCH] netpoll: Fix skb tail pointer in netpoll_send_udp()
Date: Tue, 12 Jun 2012 14:22:46 +0200 [thread overview]
Message-ID: <1339503766.22704.116.camel@edumazet-glaptop> (raw)
In-Reply-To: <1339496765-3093-1-git-send-email-bogdan.hamciuc@freescale.com>
On Tue, 2012-06-12 at 13:26 +0300, Bogdan Hamciuc wrote:
> As skb->tail wasn't updated after skb_copy_to_linear_data(), subsequent
> calls to skb_realloc_headroom() (as made by an ethernet driver's
> ndo_start_xmit routine) would only effectively copy the packet headers,
> leaving garbage in the payload.
>
> In the process, removed some unnecessary code.
>
> Signed-off-by: Bogdan Hamciuc <bogdan.hamciuc@freescale.com>
> ---
> net/core/netpoll.c | 8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/net/core/netpoll.c b/net/core/netpoll.c
> index 3d84fb9..9a08068 100644
> --- a/net/core/netpoll.c
> +++ b/net/core/netpoll.c
> @@ -362,22 +362,22 @@ EXPORT_SYMBOL(netpoll_send_skb_on_dev);
>
> void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
> {
> - int total_len, eth_len, ip_len, udp_len;
> + int total_len, ip_len, udp_len;
> struct sk_buff *skb;
> struct udphdr *udph;
> struct iphdr *iph;
> struct ethhdr *eth;
>
> udp_len = len + sizeof(*udph);
> - ip_len = eth_len = udp_len + sizeof(*iph);
> - total_len = eth_len + ETH_HLEN + NET_IP_ALIGN;
> + ip_len = udp_len + sizeof(*iph);
> + total_len = ip_len + ETH_HLEN + NET_IP_ALIGN;
>
> skb = find_skb(np, total_len, total_len - len);
> if (!skb)
> return;
>
> skb_copy_to_linear_data(skb, msg, len);
> - skb->len += len;
> + skb_put(skb, len);
>
> skb_push(skb, sizeof(*udph));
> skb_reset_transport_header(skb);
Hmm, real question is why skb_realloc_headroom() is even necessary...
I suspect we need to reserve more bytes.
total_len = ip_len + ETH_HLEN + NET_IP_ALIGN + NET_SKB_PAD;
or something like that ?
Which driver triggers the bug ?
next prev parent reply other threads:[~2012-06-12 12:22 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-12 10:26 [PATCH] netpoll: Fix skb tail pointer in netpoll_send_udp() Bogdan Hamciuc
2012-06-12 10:26 ` [PATCH] netpoll: Add support for hardware checksumming on egress Bogdan Hamciuc
2012-06-12 12:43 ` Eric Dumazet
2012-06-12 12:22 ` Eric Dumazet [this message]
2012-06-12 13:15 ` [PATCH] netpoll: Fix skb tail pointer in netpoll_send_udp() Eric Dumazet
2012-06-12 13:34 ` Eric Dumazet
2012-06-12 15:08 ` Hamciuc Bogdan-BHAMCIU1
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=1339503766.22704.116.camel@edumazet-glaptop \
--to=eric.dumazet@gmail.com \
--cc=bogdan.hamciuc@freescale.com \
--cc=davem@davemloft.net \
--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