1 files changed, 17 insertions, 13 deletions

diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index ebaa96bd3464..ab0966df1e2a 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -1397,6 +1397,8 @@ int udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
         nf_reset(skb);
 
         if (up->encap_type) {
+                int (*encap_rcv)(struct sock *sk, struct sk_buff *skb);
+
                 /*
                  * This is an encapsulation socket so pass the skb to
                  * the socket's udp_encap_rcv() hook. Otherwise, just
@@ -1409,11 +1411,11 @@ int udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
                  */
 
                 /* if we're overly short, let UDP handle it */
-                if (skb->len > sizeof(struct udphdr) &&
-                    up->encap_rcv != NULL) {
+                encap_rcv = ACCESS_ONCE(up->encap_rcv);
+                if (skb->len > sizeof(struct udphdr) && encap_rcv != NULL) {
                         int ret;
 
-                        ret = (*up->encap_rcv)(sk, skb);
+                        ret = encap_rcv(sk, skb);
                         if (ret <= 0) {
                                 UDP_INC_STATS_BH(sock_net(sk),
                                                  UDP_MIB_INDATAGRAMS,
@@ -2037,7 +2039,7 @@ static void udp_seq_stop(struct seq_file *seq, void *v)
                 spin_unlock_bh(&state->udp_table->hash[state->bucket].lock);
 }
 
-static int udp_seq_open(struct inode *inode, struct file *file)
+int udp_seq_open(struct inode *inode, struct file *file)
 {
         struct udp_seq_afinfo *afinfo = PDE(inode)->data;
         struct udp_iter_state *s;
@@ -2053,6 +2055,7 @@ static int udp_seq_open(struct inode *inode, struct file *file)
         s->udp_table            = afinfo->udp_table;
         return err;
 }
+EXPORT_SYMBOL(udp_seq_open);
 
 /* ------------------------------------------------------------------------ */
 int udp_proc_register(struct net *net, struct udp_seq_afinfo *afinfo)
@@ -2060,17 +2063,12 @@ int udp_proc_register(struct net *net, struct udp_seq_afinfo *afinfo)
         struct proc_dir_entry *p;
         int rc = 0;
 
-        afinfo->seq_fops.open           = udp_seq_open;
-        afinfo->seq_fops.read           = seq_read;
-        afinfo->seq_fops.llseek         = seq_lseek;
-        afinfo->seq_fops.release        = seq_release_net;
-
         afinfo->seq_ops.start           = udp_seq_start;
         afinfo->seq_ops.next            = udp_seq_next;
         afinfo->seq_ops.stop            = udp_seq_stop;
 
         p = proc_create_data(afinfo->name, S_IRUGO, net->proc_net,
-                             &afinfo->seq_fops, afinfo);
+                             afinfo->seq_fops, afinfo);
         if (!p)
                 rc = -ENOMEM;
         return rc;
@@ -2120,14 +2118,20 @@ int udp4_seq_show(struct seq_file *seq, void *v)
         return 0;
 }
 
+static const struct file_operations udp_afinfo_seq_fops = {
+        .owner    = THIS_MODULE,
+        .open     = udp_seq_open,
+        .read     = seq_read,
+        .llseek   = seq_lseek,
+        .release  = seq_release_net
+};
+
 /* ------------------------------------------------------------------------ */
 static struct udp_seq_afinfo udp4_seq_afinfo = {
         .name           = "udp",
         .family         = AF_INET,
         .udp_table      = &udp_table,
-        .seq_fops       = {
-                .owner  =       THIS_MODULE,
-        },
+        .seq_fops       = &udp_afinfo_seq_fops,
         .seq_ops        = {
                 .show           = udp4_seq_show,
         },