summaryrefslogtreecommitdiff
path: root/net/tipc/msg.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-07-15 10:38:54 +0200
committerIngo Molnar <mingo@kernel.org>2016-07-15 10:38:54 +0200
commit07ccdcd34ac39ddecb8ccd00e5f03d76e9be8881 (patch)
treeffd8a0ffd6d803e5fa78c115a83b7dcd3c246d7c /net/tipc/msg.c
parent3c8fad9183ab7b3b3471fd2bb3d604104dd447cb (diff)
parentfa3a9f5744a92c0d7856d4e326c8d920d1d31116 (diff)
Merge branch 'linus' into x86/apic, to refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/tipc/msg.c')
-rw-r--r--net/tipc/msg.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/net/tipc/msg.c b/net/tipc/msg.c
index 8740930f0787..17201aa8423d 100644
--- a/net/tipc/msg.c
+++ b/net/tipc/msg.c
@@ -41,6 +41,8 @@
#include "name_table.h"
#define MAX_FORWARD_SIZE 1024
+#define BUF_HEADROOM (LL_MAX_HEADER + 48)
+#define BUF_TAILROOM 16
static unsigned int align(unsigned int i)
{
@@ -505,6 +507,10 @@ bool tipc_msg_reverse(u32 own_node, struct sk_buff **skb, int err)
msg_set_hdr_sz(hdr, BASIC_H_SIZE);
}
+ if (skb_cloned(_skb) &&
+ pskb_expand_head(_skb, BUF_HEADROOM, BUF_TAILROOM, GFP_KERNEL))
+ goto exit;
+
/* Now reverse the concerned fields */
msg_set_errcode(hdr, err);
msg_set_origport(hdr, msg_destport(&ohdr));