summaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorPaolo Abeni <pabeni@redhat.com>2017-07-26 11:33:49 +0200
committerDavid S. Miller <davem@davemloft.net>2017-07-26 09:35:29 -0700
commit9688f9b020263c4a17471d09bb18e34eccc1c0a5 (patch)
tree8d8d7b5499f7c69fcd4d0a852db1c9c78e4e145d /net/ipv4
parent4813497b537c6208c90d6cbecac5072d347de900 (diff)
downloadlinux-9688f9b020263c4a17471d09bb18e34eccc1c0a5.tar.gz
linux-9688f9b020263c4a17471d09bb18e34eccc1c0a5.tar.bz2
linux-9688f9b020263c4a17471d09bb18e34eccc1c0a5.zip
udp: unbreak build lacking CONFIG_XFRM
We must use pre-processor conditional block or suitable accessors to manipulate skb->sp elsewhere builds lacking the CONFIG_XFRM will break. Fixes: dce4551cb2ad ("udp: preserve head state for IP_CMSG_PASSSEC") Signed-off-by: Paolo Abeni <pabeni@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/udp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index d243772f6efc..fac7cb9e3b0f 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -1786,7 +1786,7 @@ static int __udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
* the IP options and the cmsg flags, elsewhere can we clear all
* pending head states while they are hot in the cache
*/
- if (likely(IPCB(skb)->opt.optlen == 0 && !skb->sp))
+ if (likely(IPCB(skb)->opt.optlen == 0 && !skb_sec_path(skb)))
skb_release_head_state(skb);
rc = __udp_enqueue_schedule_skb(sk, skb);