net/ipv4/tcp_diag.c: Avoid unaligned accesses to tcpdiag_cookie.

diff --git a/net/ipv4/tcp_diag.c b/net/ipv4/tcp_diag.c
index a2248dc5b948199650a8436a8defd5626f250c7e..ed963291a7cf804566b68ef3aa471671c81d9122 100644 (file)
--- a/net/ipv4/tcp_diag.c
+++ b/net/ipv4/tcp_diag.c
@@ -66,7 +66,8 @@ static int tcpdiag_fill(struct sk_buff *skb, struct sock *sk,
        r->tcpdiag_retrans = 0;
 
        r->id.tcpdiag_if = sk->bound_dev_if;
-       *((struct sock **)&r->id.tcpdiag_cookie) = sk;
+       r->id.tcpdiag_cookie[0] = (u32)(unsigned long)sk;
+       r->id.tcpdiag_cookie[1] = (u32)(((unsigned long)sk >> 31) >> 1);
 
        if (r->tcpdiag_state == TCP_TIME_WAIT) {
                struct tcp_tw_bucket *tw = (struct tcp_tw_bucket*)sk;
@@ -237,7 +238,8 @@ static int tcpdiag_get_exact(struct sk_buff *in_skb, struct nlmsghdr *nlh)
        err = -ESTALE;
        if ((req->id.tcpdiag_cookie[0] != TCPDIAG_NOCOOKIE ||
             req->id.tcpdiag_cookie[1] != TCPDIAG_NOCOOKIE) &&
-           sk != *((struct sock **)&req->id.tcpdiag_cookie[0]))
+           ((u32)(unsigned long)sk != req->id.tcpdiag_cookie[0] ||
+            (u32)((((unsigned long)sk) >> 31) >> 1) != req->id.tcpdiag_cookie[1]))
                goto out;
 
        err = -ENOMEM;