batman-adv/patches/0004-batman-adv-check-return-value-of-pskb_trim_rcsum.patch

   1 From d22ebef1431aab13099370b89afa4ba55eb95c35 Mon Sep 17 00:00:00 2001
   2 From: Marek Lindner <lindner_marek@yahoo.de>
   3 Date: Tue, 7 May 2013 19:25:02 +0800
   4 Subject: [PATCH 04/10] batman-adv: check return value of pskb_trim_rcsum()
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 Reported-by: Sven Eckelmann <sven@narfation.org>
  10 Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
  11 Acked-by: Martin Hundebøll <martin@hundeboll.net>
  12 ---
  13  network-coding.c |    8 ++++++--
  14  1 file changed, 6 insertions(+), 2 deletions(-)
  15
  16 diff --git a/network-coding.c b/network-coding.c
  17 index f7c5430..e84629e 100644
  18 --- a/network-coding.c
  19 +++ b/network-coding.c
  20 @@ -1514,6 +1514,7 @@ batadv_nc_skb_decode_packet(struct batadv_priv *bat_priv, struct sk_buff *skb,
  21         struct ethhdr *ethhdr, ethhdr_tmp;
  22         uint8_t *orig_dest, ttl, ttvn;
  23         unsigned int coding_len;
  24 +       int err;
  25
  26         /* Save headers temporarily */
  27         memcpy(&coded_packet_tmp, skb->data, sizeof(coded_packet_tmp));
  28 @@ -1568,8 +1569,11 @@ batadv_nc_skb_decode_packet(struct batadv_priv *bat_priv, struct sk_buff *skb,
  29                          coding_len);
  30
  31         /* Resize decoded skb if decoded with larger packet */
  32 -       if (nc_packet->skb->len > coding_len + h_size)
  33 -               pskb_trim_rcsum(skb, coding_len + h_size);
  34 +       if (nc_packet->skb->len > coding_len + h_size) {
  35 +               err = pskb_trim_rcsum(skb, coding_len + h_size);
  36 +               if (err)
  37 +                       return NULL;
  38 +       }
  39
  40         /* Create decoded unicast packet */
  41         unicast_packet = (struct batadv_unicast_packet *)skb->data;
  42 --
  43 1.7.10.4
  44