2 files changed, 2 insertions, 3 deletions

diff --git a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
index 3da9d73d1b52..27c7918e442a 100644
--- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
+++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
@@ -177,7 +177,7 @@ static int ct_open(struct inode *inode, struct file *file)
         struct ct_iter_state *st;
         int ret;
 
-        st = kmalloc(sizeof(struct ct_iter_state), GFP_KERNEL);
+        st = kzalloc(sizeof(struct ct_iter_state), GFP_KERNEL);
         if (st == NULL)
                 return -ENOMEM;
         ret = seq_open(file, &ct_seq_ops);
@@ -185,7 +185,6 @@ static int ct_open(struct inode *inode, struct file *file)
                 goto out_free;
         seq          = file->private_data;
         seq->private = st;
-        memset(st, 0, sizeof(struct ct_iter_state));
         return ret;
 out_free:
         kfree(st);
diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c
index f37d5928921a..b76398d1b454 100644
--- a/net/ipv4/tcp_probe.c
+++ b/net/ipv4/tcp_probe.c
@@ -130,7 +130,7 @@ static struct jprobe tcp_jprobe = {
         .kp = {
                 .symbol_name    = "tcp_rcv_established",
         },
-        .entry  = JPROBE_ENTRY(jtcp_rcv_established),
+        .entry  = jtcp_rcv_established,
 };
 
 static int tcpprobe_open(struct inode * inode, struct file * file)