From: Sven Eckelmann <sven@narfation.org>
To: stable@vger.kernel.org
Cc: Matthias Schiffer <mschiffer@universe-factory.net>,
Sven Eckelmann <sven@narfation.org>
Subject: [PATCH 4.9 1/3] batman-adv: update data pointers after skb_cow()
Date: Tue, 17 Mar 2020 21:15:38 +0100 [thread overview]
Message-ID: <20200317201540.23496-2-sven@narfation.org> (raw)
In-Reply-To: <20200317201540.23496-1-sven@narfation.org>
From: Matthias Schiffer <mschiffer@universe-factory.net>
commit bc44b78157f621ff2a2618fe287a827bcb094ac4 upstream.
batadv_check_unicast_ttvn() calls skb_cow(), so pointers into the SKB data
must be (re)set after calling it. The ethhdr variable is dropped
altogether.
Fixes: 78fc6bbe0aca ("batman-adv: add UNICAST_4ADDR packet type")
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
net/batman-adv/routing.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c
index f9ffb1825f6d..19059ae26e51 100644
--- a/net/batman-adv/routing.c
+++ b/net/batman-adv/routing.c
@@ -930,7 +930,6 @@ int batadv_recv_unicast_packet(struct sk_buff *skb,
bool is4addr;
unicast_packet = (struct batadv_unicast_packet *)skb->data;
- unicast_4addr_packet = (struct batadv_unicast_4addr_packet *)skb->data;
is4addr = unicast_packet->packet_type == BATADV_UNICAST_4ADDR;
/* the caller function should have already pulled 2 bytes */
@@ -951,9 +950,13 @@ int batadv_recv_unicast_packet(struct sk_buff *skb,
if (!batadv_check_unicast_ttvn(bat_priv, skb, hdr_size))
return NET_RX_DROP;
+ unicast_packet = (struct batadv_unicast_packet *)skb->data;
+
/* packet for me */
if (batadv_is_my_mac(bat_priv, unicast_packet->dest)) {
if (is4addr) {
+ unicast_4addr_packet =
+ (struct batadv_unicast_4addr_packet *)skb->data;
subtype = unicast_4addr_packet->subtype;
batadv_dat_inc_counter(bat_priv, subtype);
--
2.20.1
next prev parent reply other threads:[~2020-03-17 20:15 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-17 20:15 [PATCH 4.9 0/3] batman-adv: Pending fixes; part 2 Sven Eckelmann
2020-03-17 20:15 ` Sven Eckelmann [this message]
2020-03-17 20:15 ` [PATCH 4.9 2/3] batman-adv: Avoid probe ELP information leak Sven Eckelmann
2020-03-17 20:15 ` [PATCH 4.9 3/3] batman-adv: Use explicit tvlv padding for ELP packets Sven Eckelmann
2020-03-18 18:01 ` [PATCH 4.9 0/3] batman-adv: Pending fixes; part 2 Greg KH
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=20200317201540.23496-2-sven@narfation.org \
--to=sven@narfation.org \
--cc=mschiffer@universe-factory.net \
--cc=stable@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).