summaryrefslogtreecommitdiff
path: root/net/rxrpc/ar-error.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2015-03-13 16:20:46 +0300
committerIngo Molnar <mingo@kernel.org>2015-03-13 16:21:04 +0300
commit56544d29c3a0e383c0d819fefc9570b2803db193 (patch)
tree4366fc0ba3f5115b8c1c9d171fa245d86e5415d0 /net/rxrpc/ar-error.c
parent9261dc1de11e158a5f6b4b92c8bf1ef4a02dbf0d (diff)
parent9eccca0843205f87c00404b663188b88eb248051 (diff)
downloadlinux-56544d29c3a0e383c0d819fefc9570b2803db193.tar.xz
Merge tag 'v4.0-rc3' into x86/build, to refresh an older tree before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/rxrpc/ar-error.c')
-rw-r--r--net/rxrpc/ar-error.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/net/rxrpc/ar-error.c b/net/rxrpc/ar-error.c
index 74c0fcd36838..5394b6be46ec 100644
--- a/net/rxrpc/ar-error.c
+++ b/net/rxrpc/ar-error.c
@@ -42,6 +42,11 @@ void rxrpc_UDP_error_report(struct sock *sk)
_leave("UDP socket errqueue empty");
return;
}
+ if (!skb->len) {
+ _leave("UDP empty message");
+ kfree_skb(skb);
+ return;
+ }
rxrpc_new_skb(skb);