summaryrefslogtreecommitdiff
path: root/net/tipc/msg.c
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2020-09-28 15:44:52 -0300
committerArnaldo Carvalho de Melo <acme@redhat.com>2020-09-28 15:44:52 -0300
commit717d182e4173c037fb9e720a046dec804fd9990e (patch)
tree51f14a932abcbbb17c3eb023c63179e2843982d7 /net/tipc/msg.c
parenta55b7bb1c14662490689e094964ecc5387bb2b55 (diff)
parentfb0155a09b0224a7147cb07a4ce6034c8d29667f (diff)
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes and get v5.10 development in sync with the main kernel sources. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'net/tipc/msg.c')
-rw-r--r--net/tipc/msg.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/tipc/msg.c b/net/tipc/msg.c
index 848fae674532..52e93ba4d8e2 100644
--- a/net/tipc/msg.c
+++ b/net/tipc/msg.c
@@ -150,7 +150,8 @@ int tipc_buf_append(struct sk_buff **headbuf, struct sk_buff **buf)
if (fragid == FIRST_FRAGMENT) {
if (unlikely(head))
goto err;
- if (unlikely(skb_unclone(frag, GFP_ATOMIC)))
+ frag = skb_unshare(frag, GFP_ATOMIC);
+ if (unlikely(!frag))
goto err;
head = *headbuf = frag;
*buf = NULL;