4 files changed, 46 insertions, 71 deletions

diff --git a/net/xfrm/xfrm_ipcomp.c b/net/xfrm/xfrm_ipcomp.c
index fc91ad7ee26e..e5246fbe36c4 100644
--- a/net/xfrm/xfrm_ipcomp.c
+++ b/net/xfrm/xfrm_ipcomp.c
@@ -70,26 +70,29 @@ static int ipcomp_decompress(struct xfrm_state *x, struct sk_buff *skb)
 
         while ((scratch += len, dlen -= len) > 0) {
                 skb_frag_t *frag;
+                struct page *page;
 
                 err = -EMSGSIZE;
                 if (WARN_ON(skb_shinfo(skb)->nr_frags >= MAX_SKB_FRAGS))
                         goto out;
 
                 frag = skb_shinfo(skb)->frags + skb_shinfo(skb)->nr_frags;
-                frag->page = alloc_page(GFP_ATOMIC);
+                page = alloc_page(GFP_ATOMIC);
 
                 err = -ENOMEM;
-                if (!frag->page)
+                if (!page)
                         goto out;
 
+                __skb_frag_set_page(frag, page);
+
                 len = PAGE_SIZE;
                 if (dlen < len)
                         len = dlen;
 
-                memcpy(page_address(frag->page), scratch, len);
-
                 frag->page_offset = 0;
-                frag->size = len;
+                skb_frag_size_set(frag, len);
+                memcpy(skb_frag_address(frag), scratch, len);
+
                 skb->truesize += len;
                 skb->data_len += len;
                 skb->len += len;
diff --git a/net/xfrm/xfrm_proc.c b/net/xfrm/xfrm_proc.c
index 58d9ae005597..d0a1af8ed584 100644
--- a/net/xfrm/xfrm_proc.c
+++ b/net/xfrm/xfrm_proc.c
@@ -12,6 +12,7 @@
  */
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
+#include <linux/export.h>
 #include <net/snmp.h>
 #include <net/xfrm.h>
 
diff --git a/net/xfrm/xfrm_replay.c b/net/xfrm/xfrm_replay.c
index b11ea692bd7d..39e02c54ed26 100644
--- a/net/xfrm/xfrm_replay.c
+++ b/net/xfrm/xfrm_replay.c
@@ -18,6 +18,7 @@
  * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include <linux/export.h>
 #include <net/xfrm.h>
 
 u32 xfrm_replay_seqhi(struct xfrm_state *x, __be32 net_seq)
@@ -203,8 +204,6 @@ static int xfrm_replay_check_bmp(struct xfrm_state *x,
         if (!replay_esn->replay_window)
                 return 0;
 
-        pos = (replay_esn->seq - 1) % replay_esn->replay_window;
-
         if (unlikely(seq == 0))
                 goto err;
 
@@ -216,19 +215,18 @@ static int xfrm_replay_check_bmp(struct xfrm_state *x,
                 goto err;
         }
 
-        if (pos >= diff) {
+        pos = (replay_esn->seq - 1) % replay_esn->replay_window;
+
+        if (pos >= diff)
                 bitnr = (pos - diff) % replay_esn->replay_window;
-                nr = bitnr >> 5;
-                bitnr = bitnr & 0x1F;
-                if (replay_esn->bmp[nr] & (1U << bitnr))
-                        goto err_replay;
-        } else {
+        else
                 bitnr = replay_esn->replay_window - (diff - pos);
-                nr = bitnr >> 5;
-                bitnr = bitnr & 0x1F;
-                if (replay_esn->bmp[nr] & (1U << bitnr))
-                        goto err_replay;
-        }
+
+        nr = bitnr >> 5;
+        bitnr = bitnr & 0x1F;
+        if (replay_esn->bmp[nr] & (1U << bitnr))
+                goto err_replay;
+
         return 0;
 
 err_replay:
@@ -259,39 +257,27 @@ static void xfrm_replay_advance_bmp(struct xfrm_state *x, __be32 net_seq)
                                 bitnr = bitnr & 0x1F;
                                 replay_esn->bmp[nr] &=  ~(1U << bitnr);
                         }
-
-                        bitnr = (pos + diff) % replay_esn->replay_window;
-                        nr = bitnr >> 5;
-                        bitnr = bitnr & 0x1F;
-                        replay_esn->bmp[nr] |= (1U << bitnr);
                 } else {
                         nr = (replay_esn->replay_window - 1) >> 5;
                         for (i = 0; i <= nr; i++)
                                 replay_esn->bmp[i] = 0;
-
-                        bitnr = (pos + diff) % replay_esn->replay_window;
-                        nr = bitnr >> 5;
-                        bitnr = bitnr & 0x1F;
-                        replay_esn->bmp[nr] |= (1U << bitnr);
                 }
 
+                bitnr = (pos + diff) % replay_esn->replay_window;
                 replay_esn->seq = seq;
         } else {
                 diff = replay_esn->seq - seq;
 
-                if (pos >= diff) {
+                if (pos >= diff)
                         bitnr = (pos - diff) % replay_esn->replay_window;
-                        nr = bitnr >> 5;
-                        bitnr = bitnr & 0x1F;
-                        replay_esn->bmp[nr] |= (1U << bitnr);
-                } else {
+                else
                         bitnr = replay_esn->replay_window - (diff - pos);
-                        nr = bitnr >> 5;
-                        bitnr = bitnr & 0x1F;
-                        replay_esn->bmp[nr] |= (1U << bitnr);
-                }
         }
 
+        nr = bitnr >> 5;
+        bitnr = bitnr & 0x1F;
+        replay_esn->bmp[nr] |= (1U << bitnr);
+
         if (xfrm_aevent_is_on(xs_net(x)))
                 xfrm_replay_notify(x, XFRM_REPLAY_UPDATE);
 }
@@ -390,8 +376,6 @@ static int xfrm_replay_check_esn(struct xfrm_state *x,
         if (!wsize)
                 return 0;
 
-        pos = (replay_esn->seq - 1) % replay_esn->replay_window;
-
         if (unlikely(seq == 0 && replay_esn->seq_hi == 0 &&
                      (replay_esn->seq < replay_esn->replay_window - 1)))
                 goto err;
@@ -415,19 +399,18 @@ static int xfrm_replay_check_esn(struct xfrm_state *x,
                 goto err;
         }
 
-        if (pos >= diff) {
+        pos = (replay_esn->seq - 1) % replay_esn->replay_window;
+
+        if (pos >= diff)
                 bitnr = (pos - diff) % replay_esn->replay_window;
-                nr = bitnr >> 5;
-                bitnr = bitnr & 0x1F;
-                if (replay_esn->bmp[nr] & (1U << bitnr))
-                        goto err_replay;
-        } else {
+        else
                 bitnr = replay_esn->replay_window - (diff - pos);
-                nr = bitnr >> 5;
-                bitnr = bitnr & 0x1F;
-                if (replay_esn->bmp[nr] & (1U << bitnr))
-                        goto err_replay;
-        }
+
+        nr = bitnr >> 5;
+        bitnr = bitnr & 0x1F;
+        if (replay_esn->bmp[nr] & (1U << bitnr))
+                goto err_replay;
+
         return 0;
 
 err_replay:
@@ -465,22 +448,13 @@ static void xfrm_replay_advance_esn(struct xfrm_state *x, __be32 net_seq)
                                 bitnr = bitnr & 0x1F;
                                 replay_esn->bmp[nr] &=  ~(1U << bitnr);
                         }
-
-                        bitnr = (pos + diff) % replay_esn->replay_window;
-                        nr = bitnr >> 5;
-                        bitnr = bitnr & 0x1F;
-                        replay_esn->bmp[nr] |= (1U << bitnr);
                 } else {
                         nr = (replay_esn->replay_window - 1) >> 5;
                         for (i = 0; i <= nr; i++)
                                 replay_esn->bmp[i] = 0;
-
-                        bitnr = (pos + diff) % replay_esn->replay_window;
-                        nr = bitnr >> 5;
-                        bitnr = bitnr & 0x1F;
-                        replay_esn->bmp[nr] |= (1U << bitnr);
                 }
 
+                bitnr = (pos + diff) % replay_esn->replay_window;
                 replay_esn->seq = seq;
 
                 if (unlikely(wrap > 0))
@@ -488,19 +462,16 @@ static void xfrm_replay_advance_esn(struct xfrm_state *x, __be32 net_seq)
         } else {
                 diff = replay_esn->seq - seq;
 
-                if (pos >= diff) {
+                if (pos >= diff)
                         bitnr = (pos - diff) % replay_esn->replay_window;
-                        nr = bitnr >> 5;
-                        bitnr = bitnr & 0x1F;
-                        replay_esn->bmp[nr] |= (1U << bitnr);
-                } else {
+                else
                         bitnr = replay_esn->replay_window - (diff - pos);
-                        nr = bitnr >> 5;
-                        bitnr = bitnr & 0x1F;
-                        replay_esn->bmp[nr] |= (1U << bitnr);
-                }
         }
 
+        nr = bitnr >> 5;
+        bitnr = bitnr & 0x1F;
+        replay_esn->bmp[nr] |= (1U << bitnr);
+
         if (xfrm_aevent_is_on(xs_net(x)))
                 xfrm_replay_notify(x, XFRM_REPLAY_UPDATE);
 }
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index 0256b8a0a7cf..d0a42df5160e 100644
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -2927,7 +2927,7 @@ static int __net_init xfrm_user_net_init(struct net *net)
         if (nlsk == NULL)
                 return -ENOMEM;
         net->xfrm.nlsk_stash = nlsk; /* Don't set to NULL */
-        rcu_assign_pointer(net->xfrm.nlsk, nlsk);
+        RCU_INIT_POINTER(net->xfrm.nlsk, nlsk);
         return 0;
 }
 
@@ -2935,7 +2935,7 @@ static void __net_exit xfrm_user_net_exit(struct list_head *net_exit_list)
 {
         struct net *net;
         list_for_each_entry(net, net_exit_list, exit_list)
-                rcu_assign_pointer(net->xfrm.nlsk, NULL);
+                RCU_INIT_POINTER(net->xfrm.nlsk, NULL);
         synchronize_net();
         list_for_each_entry(net, net_exit_list, exit_list)
                 netlink_kernel_release(net->xfrm.nlsk_stash);