netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jim Westfall <jwestfall@surrealistic.net>
To: netdev@vger.kernel.org, acme@ghostprotocols.net
Subject: [PATCH] llc: fix skb size for test responses
Date: Sun, 24 Feb 2008 11:07:58 -0800	[thread overview]
Message-ID: <20080224190758.GW84358@surrealistic.net> (raw)

Hi

The llc test command is used for a layer2 ping and contains a variable 
length payload that we must include in the response.  Use the size of the 
received skb as the size of the skb we must allocate to hold the payload. 

This resolved an skb_over_panic(), when trying to copy the payload into 
what was a hard coded skb of size 128.

Signed-off-by: Jim Westfall <jwestfall@surrealistic.net>

diff -urp linux-2.6.24.2.org/net/llc/llc_s_ac.c linux-2.6.24.2/net/llc/llc_s_ac.c
--- linux-2.6.24.2.org/net/llc/llc_s_ac.c	2008-02-10 21:51:11.000000000 -0800
+++ linux-2.6.24.2/net/llc/llc_s_ac.c	2008-02-24 10:15:02.000000000 -0800
@@ -148,9 +148,18 @@ int llc_sap_action_send_test_r(struct ll
 	llc_pdu_decode_sa(skb, mac_da);
 	llc_pdu_decode_da(skb, mac_sa);
 	llc_pdu_decode_ssap(skb, &dsap);
-	nskb = llc_alloc_frame(NULL, skb->dev);
+	nskb = alloc_skb(skb->end - skb->head, GFP_ATOMIC);
+
 	if (!nskb)
 		goto out;
+
+	skb_reset_mac_header(nskb);
+	skb_reserve(nskb, 50);
+	skb_reset_network_header(nskb);
+	skb_reset_transport_header(nskb);
+	nskb->protocol = htons(ETH_P_802_2);
+	nskb->dev = skb->dev;
+
 	llc_pdu_header_init(nskb, LLC_PDU_TYPE_U, sap->laddr.lsap, dsap,
 			    LLC_PDU_RSP);
 	llc_pdu_init_as_test_rsp(nskb, skb);
diff -urp linux-2.6.24.2.org/net/llc/llc_station.c linux-2.6.24.2/net/llc/llc_station.c
--- linux-2.6.24.2.org/net/llc/llc_station.c	2008-02-10 21:51:11.000000000 -0800
+++ linux-2.6.24.2/net/llc/llc_station.c	2008-02-24 10:10:01.000000000 -0800
@@ -298,10 +298,18 @@ static int llc_station_ac_send_test_r(st
 {
 	u8 mac_da[ETH_ALEN], dsap;
 	int rc = 1;
-	struct sk_buff *nskb = llc_alloc_frame(NULL, skb->dev);
+	struct sk_buff *nskb = alloc_skb(skb->end - skb->head, GFP_ATOMIC);
 
 	if (!nskb)
 		goto out;
+
+	skb_reset_mac_header(nskb);
+	skb_reserve(nskb, 50);
+	skb_reset_network_header(nskb);
+	skb_reset_transport_header(nskb);
+	nskb->protocol = htons(ETH_P_802_2);
+	nskb->dev = skb->dev;
+
 	rc = 0;
 	llc_pdu_decode_sa(skb, mac_da);
 	llc_pdu_decode_ssap(skb, &dsap);


             reply	other threads:[~2008-02-24 19:08 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-02-24 19:07 Jim Westfall [this message]
2008-02-25  2:51 ` [PATCH] llc: fix skb size for test responses David Miller
2008-02-25  5:04   ` Jim Westfall
2008-02-25  8:30     ` Joonwoo Park
2008-02-25 14:06     ` Arnaldo Carvalho de Melo
2008-02-25 19:47     ` David Miller
2008-02-26  7:00 ` Joonwoo Park

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=20080224190758.GW84358@surrealistic.net \
    --to=jwestfall@surrealistic.net \
    --cc=acme@ghostprotocols.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;
as well as URLs for NNTP newsgroup(s).