xfrm: Add a secpath_set helper.

Add a new helper to set the secpath to the skb.
This avoids code duplication, as this is used
in multiple places.

Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>

diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index 6e061309adca8a03a58c91f72fcfaa4f674df3c7..287635df4eefd856be0ca6da8d284a008259dda5 100644 (file)
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -1006,6 +1006,7 @@ secpath_put(struct sec_path *sp)
 }
 
 struct sec_path *secpath_dup(struct sec_path *src);
+int secpath_set(struct sk_buff *skb);
 
 static inline void
 secpath_reset(struct sk_buff *skb)

diff --git a/net/ipv6/xfrm6_input.c b/net/ipv6/xfrm6_input.c
index b5789562aded9274f706225df3f69e45efac5008..662fb2c3e765d9024f720ffbeaa1f4150a6f7679 100644 (file)
--- a/net/ipv6/xfrm6_input.c
+++ b/net/ipv6/xfrm6_input.c
@@ -69,18 +69,9 @@ int xfrm6_input_addr(struct sk_buff *skb, xfrm_address_t *daddr,
        struct xfrm_state *x = NULL;
        int i = 0;
 
-       /* Allocate new secpath or COW existing one. */
-       if (!skb->sp || atomic_read(&skb->sp->refcnt) != 1) {
-               struct sec_path *sp;
-
-               sp = secpath_dup(skb->sp);
-               if (!sp) {
-                       XFRM_INC_STATS(net, LINUX_MIB_XFRMINERROR);
-                       goto drop;
-               }
-               if (skb->sp)
-                       secpath_put(skb->sp);
-               skb->sp = sp;
+       if (secpath_set(skb)) {
+               XFRM_INC_STATS(net, LINUX_MIB_XFRMINERROR);
+               goto drop;
        }
 
        if (1 + skb->sp->len == XFRM_MAX_DEPTH) {

diff --git a/net/xfrm/xfrm_input.c b/net/xfrm/xfrm_input.c
index 8722294c6e59a71e31743a9761a0f936d3284bb6..d8f913bb69199e18111295ab4354df5cef648bdf 100644 (file)
--- a/net/xfrm/xfrm_input.c
+++ b/net/xfrm/xfrm_input.c
@@ -117,6 +117,24 @@ struct sec_path *secpath_dup(struct sec_path *src)
 }
 EXPORT_SYMBOL(secpath_dup);
 
+int secpath_set(struct sk_buff *skb)
+{
+       struct sec_path *sp;
+
+       /* Allocate new secpath or COW existing one. */
+       if (!skb->sp || atomic_read(&skb->sp->refcnt) != 1) {
+               sp = secpath_dup(skb->sp);
+               if (!sp)
+                       return -ENOMEM;
+
+               if (skb->sp)
+                       secpath_put(skb->sp);
+               skb->sp = sp;
+       }
+       return 0;
+}
+EXPORT_SYMBOL(secpath_set);
+
 /* Fetch spi and seq from ipsec header */
 
 int xfrm_parse_spi(struct sk_buff *skb, u8 nexthdr, __be32 *spi, __be32 *seq)
@@ -212,18 +230,10 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type)
                break;
        }
 
-       /* Allocate new secpath or COW existing one. */
-       if (!skb->sp || atomic_read(&skb->sp->refcnt) != 1) {
-               struct sec_path *sp;
-
-               sp = secpath_dup(skb->sp);
-               if (!sp) {
-                       XFRM_INC_STATS(net, LINUX_MIB_XFRMINERROR);
-                       goto drop;
-               }
-               if (skb->sp)
-                       secpath_put(skb->sp);
-               skb->sp = sp;
+       err = secpath_set(skb);
+       if (err) {
+               XFRM_INC_STATS(net, LINUX_MIB_XFRMINERROR);
+               goto drop;
        }
 
        seq = 0;