1 files changed, 5 insertions, 4 deletions

diff --git a/net/netfilter/nf_conntrack_sane.c b/net/netfilter/nf_conntrack_sane.c
index b5a16c6e21c2..a70051d741a7 100644
--- a/net/netfilter/nf_conntrack_sane.c
+++ b/net/netfilter/nf_conntrack_sane.c
@@ -62,8 +62,9 @@ static int help(struct sk_buff *skb,
                 enum ip_conntrack_info ctinfo)
 {
         unsigned int dataoff, datalen;
-        struct tcphdr _tcph, *th;
-        char *sb_ptr;
+        const struct tcphdr *th;
+        struct tcphdr _tcph;
+        void *sb_ptr;
         int ret = NF_ACCEPT;
         int dir = CTINFO2DIR(ctinfo);
         struct nf_ct_sane_master *ct_sane_info;
@@ -99,7 +100,7 @@ static int help(struct sk_buff *skb,
                 if (datalen != sizeof(struct sane_request))
                         goto out;
 
-                req = (struct sane_request *)sb_ptr;
+                req = sb_ptr;
                 if (req->RPC_code != htonl(SANE_NET_START)) {
                         /* Not an interesting command */
                         ct_sane_info->state = SANE_STATE_NORMAL;
@@ -123,7 +124,7 @@ static int help(struct sk_buff *skb,
                 goto out;
         }
 
-        reply = (struct sane_reply_net_start *)sb_ptr;
+        reply = sb_ptr;
         if (reply->status != htonl(SANE_STATUS_SUCCESS)) {
                 /* saned refused the command */
                 pr_debug("nf_ct_sane: unsuccessful SANE_STATUS = %u\n",