2 files changed, 10 insertions, 10 deletions

diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
index 279471c4e58f..bdb222c0c6a2 100644
--- a/net/ipv4/ip_sockglue.c
+++ b/net/ipv4/ip_sockglue.c
@@ -510,9 +510,10 @@ int ip_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len)
                 copied = len;
         }
         err = skb_copy_datagram_msg(skb, 0, msg, copied);
-        if (err)
-                goto out_free_skb;
-
+        if (unlikely(err)) {
+                kfree_skb(skb);
+                return err;
+        }
         sock_recv_timestamp(msg, sk, skb);
 
         serr = SKB_EXT_ERR(skb);
@@ -544,8 +545,7 @@ int ip_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len)
         msg->msg_flags |= MSG_ERRQUEUE;
         err = copied;
 
-out_free_skb:
-        kfree_skb(skb);
+        consume_skb(skb);
 out:
         return err;
 }
diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
index 3962b6c810fc..ea9ee5cce5cf 100644
--- a/net/ipv6/datagram.c
+++ b/net/ipv6/datagram.c
@@ -450,9 +450,10 @@ int ipv6_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len)
                 copied = len;
         }
         err = skb_copy_datagram_msg(skb, 0, msg, copied);
-        if (err)
-                goto out_free_skb;
-
+        if (unlikely(err)) {
+                kfree_skb(skb);
+                return err;
+        }
         sock_recv_timestamp(msg, sk, skb);
 
         serr = SKB_EXT_ERR(skb);
@@ -509,8 +510,7 @@ int ipv6_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len)
         msg->msg_flags |= MSG_ERRQUEUE;
         err = copied;
 
-out_free_skb:
-        kfree_skb(skb);
+        consume_skb(skb);
 out:
         return err;
 }