Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1164948AbdD1Iav (ORCPT ); Fri, 28 Apr 2017 04:30:51 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:55432 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S968264AbdD1Ial (ORCPT ); Fri, 28 Apr 2017 04:30:41 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Richard Alpe , Jon Maloy , "David S. Miller" Subject: [PATCH 4.4 01/17] tipc: make sure IPv6 header fits in skb headroom Date: Fri, 28 Apr 2017 10:30:14 +0200 Message-Id: <20170428082910.395031025@linuxfoundation.org> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170428082910.160564394@linuxfoundation.org> References: <20170428082910.160564394@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1073 Lines: 34 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Richard Alpe commit 9bd160bfa27fa41927dbbce7ee0ea779700e09ef upstream. Expand headroom further in order to be able to fit the larger IPv6 header. Prior to this patch this caused a skb under panic for certain tipc packets when using IPv6 UDP bearer(s). Signed-off-by: Richard Alpe Acked-by: Jon Maloy Signed-off-by: David S. Miller Signed-off-by: Jon Maloy Signed-off-by: Greg Kroah-Hartman --- net/tipc/udp_media.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/tipc/udp_media.c +++ b/net/tipc/udp_media.c @@ -52,7 +52,7 @@ /* IANA assigned UDP port */ #define UDP_PORT_DEFAULT 6118 -#define UDP_MIN_HEADROOM 28 +#define UDP_MIN_HEADROOM 48 static const struct nla_policy tipc_nl_udp_policy[TIPC_NLA_UDP_MAX + 1] = { [TIPC_NLA_UDP_UNSPEC] = {.type = NLA_UNSPEC},