From: Antonio Quartulli <ordex@autistici.org>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org,
Antonio Quartulli <ordex@autistici.org>
Subject: [PATCH 13/16] batman-adv: check for more space before accessing the skb
Date: Sun, 28 Oct 2012 12:17:14 +0100 [thread overview]
Message-ID: <1351423037-5292-14-git-send-email-ordex@autistici.org> (raw)
In-Reply-To: <1351423037-5292-1-git-send-email-ordex@autistici.org>
In batadv_check_unicast_ttvn() the code accesses both the unicast header and the
Ethernet header in the payload. For this reason pskb_may_pull() must be invoked
to check for the required space.
Signed-off-by: Antonio Quartulli <ordex@autistici.org>
---
net/batman-adv/routing.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c
index 456a0a9..46dd5b4 100644
--- a/net/batman-adv/routing.c
+++ b/net/batman-adv/routing.c
@@ -908,8 +908,12 @@ static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv,
bool tt_poss_change;
int is_old_ttvn;
- /* I could need to modify it */
- if (skb_cow(skb, sizeof(struct batadv_unicast_packet)) < 0)
+ /* check if there is enough data before accessing it */
+ if (pskb_may_pull(skb, sizeof(*unicast_packet) + ETH_HLEN) < 0)
+ return 0;
+
+ /* create a copy of the skb (in case of for re-routing) to modify it. */
+ if (skb_cow(skb, sizeof(*unicast_packet)) < 0)
return 0;
unicast_packet = (struct batadv_unicast_packet *)skb->data;
--
1.7.12.4
WARNING: multiple messages have this Message-ID (diff)
From: Antonio Quartulli <ordex@autistici.org>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org
Subject: [B.A.T.M.A.N.] [PATCH 13/16] batman-adv: check for more space before accessing the skb
Date: Sun, 28 Oct 2012 12:17:14 +0100 [thread overview]
Message-ID: <1351423037-5292-14-git-send-email-ordex@autistici.org> (raw)
In-Reply-To: <1351423037-5292-1-git-send-email-ordex@autistici.org>
In batadv_check_unicast_ttvn() the code accesses both the unicast header and the
Ethernet header in the payload. For this reason pskb_may_pull() must be invoked
to check for the required space.
Signed-off-by: Antonio Quartulli <ordex@autistici.org>
---
net/batman-adv/routing.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c
index 456a0a9..46dd5b4 100644
--- a/net/batman-adv/routing.c
+++ b/net/batman-adv/routing.c
@@ -908,8 +908,12 @@ static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv,
bool tt_poss_change;
int is_old_ttvn;
- /* I could need to modify it */
- if (skb_cow(skb, sizeof(struct batadv_unicast_packet)) < 0)
+ /* check if there is enough data before accessing it */
+ if (pskb_may_pull(skb, sizeof(*unicast_packet) + ETH_HLEN) < 0)
+ return 0;
+
+ /* create a copy of the skb (in case of for re-routing) to modify it. */
+ if (skb_cow(skb, sizeof(*unicast_packet)) < 0)
return 0;
unicast_packet = (struct batadv_unicast_packet *)skb->data;
--
1.7.12.4
next prev parent reply other threads:[~2012-10-28 11:18 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-28 11:17 pull request: batman-adv 2012-10-28 Antonio Quartulli
2012-10-28 11:17 ` [B.A.T.M.A.N.] " Antonio Quartulli
2012-10-28 11:17 ` [PATCH 01/16] batman-adv: use check_unicast_packet() in recv_roam_adv() Antonio Quartulli
2012-10-28 11:17 ` [B.A.T.M.A.N.] " Antonio Quartulli
2012-10-28 11:17 ` [PATCH 02/16] batman-adv: split hard_iface struct for each routing protocol Antonio Quartulli
2012-10-28 11:17 ` [B.A.T.M.A.N.] " Antonio Quartulli
2012-10-28 11:17 ` [PATCH 03/16] batman-adv: separate BATADV_ATTR_HIF_UINT sysfs name from hard-iface variable Antonio Quartulli
2012-10-28 11:17 ` [B.A.T.M.A.N.] " Antonio Quartulli
2012-10-28 22:59 ` David Miller
2012-10-28 22:59 ` [B.A.T.M.A.N.] " David Miller
[not found] ` <20121028.185927.374901219739099234.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
2012-10-29 8:13 ` Antonio Quartulli
2012-10-29 8:13 ` [B.A.T.M.A.N.] " Antonio Quartulli
2012-10-28 11:17 ` [PATCH 04/16] batman-adv: consolidate duplicated primary_if checking code Antonio Quartulli
2012-10-28 11:17 ` [B.A.T.M.A.N.] " Antonio Quartulli
2012-10-28 11:17 ` [PATCH 05/16] batman-adv: return proper value in case of hash_add failure Antonio Quartulli
2012-10-28 11:17 ` [B.A.T.M.A.N.] " Antonio Quartulli
2012-10-28 11:17 ` [PATCH 06/16] batman-adv: Set special lockdep classes to avoid lockdep warning Antonio Quartulli
2012-10-28 11:17 ` [B.A.T.M.A.N.] " Antonio Quartulli
2012-10-28 11:17 ` [PATCH 07/16] batman-adv: Remove extra check in batadv_bit_get_packet Antonio Quartulli
2012-10-28 11:17 ` [B.A.T.M.A.N.] " Antonio Quartulli
2012-10-28 11:17 ` [PATCH 08/16] batman-adv: Check return value of try_module_get Antonio Quartulli
2012-10-28 11:17 ` [B.A.T.M.A.N.] " Antonio Quartulli
2012-10-28 11:17 ` [PATCH 09/16] batman-adv: Only increase refcounter once for alternate router Antonio Quartulli
2012-10-28 11:17 ` [B.A.T.M.A.N.] " Antonio Quartulli
2012-10-28 11:17 ` [PATCH 10/16] batman-adv: don't allow ECTP traffic on batman-adv Antonio Quartulli
2012-10-28 11:17 ` [B.A.T.M.A.N.] " Antonio Quartulli
2012-10-28 11:17 ` [PATCH 11/16] batman-adv: properly store the roaming time Antonio Quartulli
2012-10-28 11:17 ` [B.A.T.M.A.N.] " Antonio Quartulli
2012-10-28 11:17 ` [PATCH 12/16] batman-adv: print packets re-routing on DBG_TT and ratelimit it Antonio Quartulli
2012-10-28 11:17 ` [B.A.T.M.A.N.] " Antonio Quartulli
2012-10-28 11:17 ` Antonio Quartulli [this message]
2012-10-28 11:17 ` [B.A.T.M.A.N.] [PATCH 13/16] batman-adv: check for more space before accessing the skb Antonio Quartulli
2012-10-28 11:17 ` [PATCH 14/16] batman-adv: properly convert flag into a boolean value Antonio Quartulli
2012-10-28 11:17 ` [B.A.T.M.A.N.] " Antonio Quartulli
2012-10-28 11:17 ` [PATCH 15/16] batman-adv: pass the WIFI flag from the local to global entry Antonio Quartulli
2012-10-28 11:17 ` [B.A.T.M.A.N.] " Antonio Quartulli
2012-10-28 11:17 ` [PATCH 16/16] batman-adv: add kernel-doc for enum batadv_dbg_level Antonio Quartulli
2012-10-28 11:17 ` [B.A.T.M.A.N.] " Antonio Quartulli
[not found] ` <1351423037-5292-17-git-send-email-ordex-GaUfNO9RBHfsrOwW+9ziJQ@public.gmane.org>
2012-10-28 13:32 ` Walter Robert Ditzler
2012-10-28 13:32 ` [B.A.T.M.A.N.] " Walter Robert Ditzler
2012-10-28 14:33 ` Sven Eckelmann
2012-10-29 8:58 pull request: batman-adv 202-10-29 Antonio Quartulli
2012-10-29 8:58 ` [PATCH 13/16] batman-adv: check for more space before accessing the skb 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=1351423037-5292-14-git-send-email-ordex@autistici.org \
--to=ordex@autistici.org \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.