[linux] 01/02: Fix missing #include in "ip6_gre: fix ip6gre_err() invalid reads"

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch jessie-security
in repository linux.

commit 32dd1ef65b97b988dc0a6e2c9996b5e5355b7d74
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Tue Feb 21 21:45:11 2017 +0000

    Fix missing #include in "ip6_gre: fix ip6gre_err() invalid reads"
---
 .../bugfix/all/ip6_gre-fix-ip6gre_err-invalid-reads.patch  | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/debian/patches/bugfix/all/ip6_gre-fix-ip6gre_err-invalid-reads.patch b/debian/patches/bugfix/all/ip6_gre-fix-ip6gre_err-invalid-reads.patch
index ae10529..18a207c 100644
--- a/debian/patches/bugfix/all/ip6_gre-fix-ip6gre_err-invalid-reads.patch
+++ b/debian/patches/bugfix/all/ip6_gre-fix-ip6gre_err-invalid-reads.patch
@@ -22,14 +22,24 @@ Fixes: c12b395a4664 ("gre: Support GRE over IPv6")
 Signed-off-by: Eric Dumazet <edumazet at google.com>
 Reported-by: Andrey Konovalov <andreyknvl at google.com>
 Signed-off-by: David S. Miller <davem at davemloft.net>
-[bwh: Backported to 3.16: adjust context]
+[bwh: Backported to 3.16:
+ - Add #include <net/gre.h>, added earlier upstream
+ - Adjust context]
 ---
  net/ipv6/ip6_gre.c | 40 +++++++++++++++++++++-------------------
  1 file changed, 21 insertions(+), 19 deletions(-)
 
 --- a/net/ipv6/ip6_gre.c
 +++ b/net/ipv6/ip6_gre.c
-@@ -364,35 +364,37 @@ static void ip6gre_tunnel_uninit(struct
+@@ -55,6 +55,7 @@
+ #include <net/ip6_fib.h>
+ #include <net/ip6_route.h>
+ #include <net/ip6_tunnel.h>
++#include <net/gre.h>
+ 
+ 
+ static bool log_ecn_error = true;
+@@ -364,35 +365,37 @@ static void ip6gre_tunnel_uninit(struct
  
  
  static void ip6gre_err(struct sk_buff *skb, struct inet6_skb_parm *opt,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git