net: use skb_sec_path helper in more places

skb_sec_path gains 'const' qualifier to avoid
xt_policy.c: 'skb_sec_path' discards 'const' qualifier from pointer target type

same reasoning as previous conversions: Won't need to touch these
spots anymore when skb->sp is removed.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 24 insertions, 15 deletions

diff --git a/net/xfrm/xfrm_device.c b/net/xfrm/xfrm_device.c
index 144c137886b1..b8736f56e7f7 100644
--- a/net/xfrm/xfrm_device.c
+++ b/net/xfrm/xfrm_device.c
@@ -32,6 +32,7 @@ struct sk_buff *validate_xmit_xfrm(struct sk_buff *skb, netdev_features_t featur
         struct softnet_data *sd;
         netdev_features_t esp_features = features;
         struct xfrm_offload *xo = xfrm_offload(skb);
+        struct sec_path *sp;
 
         if (!xo)
                 return skb;
@@ -39,7 +40,8 @@ struct sk_buff *validate_xmit_xfrm(struct sk_buff *skb, netdev_features_t featur
         if (!(features & NETIF_F_HW_ESP))
                 esp_features = features & ~(NETIF_F_SG | NETIF_F_CSUM_MASK);
 
-        x = skb->sp->xvec[skb->sp->len - 1];
+        sp = skb_sec_path(skb);
+        x = sp->xvec[sp->len - 1];
         if (xo->flags & XFRM_GRO || x->xso.flags & XFRM_OFFLOAD_INBOUND)
                 return skb;
 
diff --git a/net/xfrm/xfrm_input.c b/net/xfrm/xfrm_input.c
index bda929b9ff35..b4db25b244fa 100644
--- a/net/xfrm/xfrm_input.c
+++ b/net/xfrm/xfrm_input.c
@@ -330,7 +330,9 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type)
         daddr = (xfrm_address_t *)(skb_network_header(skb) +
                                    XFRM_SPI_SKB_CB(skb)->daddroff);
         do {
-                if (skb->sp->len == XFRM_MAX_DEPTH) {
+                sp = skb_sec_path(skb);
+
+                if (sp->len == XFRM_MAX_DEPTH) {
                         secpath_reset(skb);
                         XFRM_INC_STATS(net, LINUX_MIB_XFRMINBUFFERERROR);
                         goto drop;
@@ -346,7 +348,7 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type)
 
                 skb->mark = xfrm_smark_get(skb->mark, x);
 
-                skb->sp->xvec[skb->sp->len++] = x;
+                sp->xvec[sp->len++] = x;
 
 lock:
                 spin_lock(&x->lock);
@@ -470,8 +472,9 @@ resume:
         nf_reset(skb);
 
         if (decaps) {
-                if (skb->sp)
-                        skb->sp->olen = 0;
+                sp = skb_sec_path(skb);
+                if (sp)
+                        sp->olen = 0;
                 skb_dst_drop(skb);
                 gro_cells_receive(&gro_cells, skb);
                 return 0;
@@ -482,8 +485,9 @@ resume:
 
                 err = x->inner_mode->afinfo->transport_finish(skb, xfrm_gro || async);
                 if (xfrm_gro) {
-                        if (skb->sp)
-                                skb->sp->olen = 0;
+                        sp = skb_sec_path(skb);
+                        if (sp)
+                                sp->olen = 0;
                         skb_dst_drop(skb);
                         gro_cells_receive(&gro_cells, skb);
                         return err;
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index be04091eb7db..d6acba07bdc9 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -3200,11 +3200,12 @@ EXPORT_SYMBOL(xfrm_lookup_route);
 static inline int
 xfrm_secpath_reject(int idx, struct sk_buff *skb, const struct flowi *fl)
 {
+        struct sec_path *sp = skb_sec_path(skb);
         struct xfrm_state *x;
 
-        if (!skb->sp || idx < 0 || idx >= skb->sp->len)
+        if (!sp || idx < 0 || idx >= sp->len)
                 return 0;
-        x = skb->sp->xvec[idx];
+        x = sp->xvec[idx];
         if (!x->type->reject)
                 return 0;
         return x->type->reject(x, skb, fl);
@@ -3304,6 +3305,7 @@ int __xfrm_policy_check(struct sock *sk, int dir, struct sk_buff *skb,
         struct flowi fl;
         int xerr_idx = -1;
         const struct xfrm_if_cb *ifcb;
+        struct sec_path *sp;
         struct xfrm_if *xi;
         u32 if_id = 0;
 
@@ -3328,11 +3330,12 @@ int __xfrm_policy_check(struct sock *sk, int dir, struct sk_buff *skb,
         nf_nat_decode_session(skb, &fl, family);
 
         /* First, check used SA against their selectors. */
-        if (skb->sp) {
+        sp = skb_sec_path(skb);
+        if (sp) {
                 int i;
 
-                for (i = skb->sp->len-1; i >= 0; i--) {
-                        struct xfrm_state *x = skb->sp->xvec[i];
+                for (i = sp->len - 1; i >= 0; i--) {
+                        struct xfrm_state *x = sp->xvec[i];
                         if (!xfrm_selector_match(&x->sel, &fl, family)) {
                                 XFRM_INC_STATS(net, LINUX_MIB_XFRMINSTATEMISMATCH);
                                 return 0;
@@ -3359,7 +3362,7 @@ int __xfrm_policy_check(struct sock *sk, int dir, struct sk_buff *skb,
         }
 
         if (!pol) {
-                if (skb->sp && secpath_has_nontransport(skb->sp, 0, &xerr_idx)) {
+                if (sp && secpath_has_nontransport(sp, 0, &xerr_idx)) {
                         xfrm_secpath_reject(xerr_idx, skb, &fl);
                         XFRM_INC_STATS(net, LINUX_MIB_XFRMINNOPOLS);
                         return 0;
@@ -3388,7 +3391,6 @@ int __xfrm_policy_check(struct sock *sk, int dir, struct sk_buff *skb,
 #endif
 
         if (pol->action == XFRM_POLICY_ALLOW) {
-                struct sec_path *sp;
                 static struct sec_path dummy;
                 struct xfrm_tmpl *tp[XFRM_MAX_DEPTH];
                 struct xfrm_tmpl *stp[XFRM_MAX_DEPTH];
@@ -3396,7 +3398,8 @@ int __xfrm_policy_check(struct sock *sk, int dir, struct sk_buff *skb,
                 int ti = 0;
                 int i, k;
 
-                if ((sp = skb->sp) == NULL)
+                sp = skb_sec_path(skb);
+                if (!sp)
                         sp = &dummy;
 
                 for (pi = 0; pi < npols; pi++) {