From: "Linus Lüssing" <linus.luessing@web.de>
To: b.a.t.m.a.n@lists.open-mesh.org
Subject: [B.A.T.M.A.N.] [PATCH 2/2] batman-adv: fix potential kernel paging error for unicast transmissions
Date: Fri, 26 Jul 2013 20:50:46 +0200 [thread overview]
Message-ID: <1374864646-19268-2-git-send-email-linus.luessing@web.de> (raw)
In-Reply-To: <1374864646-19268-1-git-send-email-linus.luessing@web.de>
batadv_send_skb_prepare_unicast(_4addr) might reallocate the skb's
data. If it does then our ethhdr pointer is not valid anymore in
batadv_send_skb_unicast(), resulting in a kernel paging error.
This patch fixes this issue by storing the few bytes we are interested
in on the stack before modifying the skb.
Signed-off-by: Linus Lüssing <linus.luessing@web.de>
---
send.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/send.c b/send.c
index 9c9cab6..b9a1f15 100644
--- a/send.c
+++ b/send.c
@@ -257,13 +257,15 @@ static int batadv_send_skb_unicast(struct batadv_priv *bat_priv,
struct batadv_orig_node *orig_node,
unsigned short vid)
{
- struct ethhdr *ethhdr = (struct ethhdr *)skb->data;
+ uint8_t dest[ETH_ALEN];
struct batadv_unicast_packet *unicast_packet;
int ret = NET_XMIT_DROP;
if (!orig_node)
goto out;
+ memcpy(dest, ((struct ethhdr *)skb->data)->h_dest, sizeof(dest));
+
switch (packet_type) {
case BATADV_UNICAST:
if (!batadv_send_skb_prepare_unicast(skb, orig_node))
@@ -289,7 +291,7 @@ static int batadv_send_skb_unicast(struct batadv_priv *bat_priv,
* try to reroute it because the ttvn contained in the header is less
* than the current one
*/
- if (batadv_tt_global_client_is_roaming(bat_priv, ethhdr->h_dest, vid))
+ if (batadv_tt_global_client_is_roaming(bat_priv, dest, vid))
unicast_packet->ttvn = unicast_packet->ttvn - 1;
if (batadv_send_skb_to_orig(skb, orig_node, NULL) != NET_XMIT_DROP)
--
1.7.10.4
next prev parent reply other threads:[~2013-07-26 18:50 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-26 18:50 [B.A.T.M.A.N.] [PATCH 1/2] batman-adv: check return type of unicast packet preparations Linus Lüssing
2013-07-26 18:50 ` Linus Lüssing [this message]
2013-07-26 19:19 ` Antonio Quartulli
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=1374864646-19268-2-git-send-email-linus.luessing@web.de \
--to=linus.luessing@web.de \
--cc=b.a.t.m.a.n@lists.open-mesh.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