From e03bbdd315a34dbbe37675be15e6add2e96675a5 Mon Sep 17 00:00:00 2001 From: Alok Makhariya Date: Fri, 30 Oct 2015 14:26:27 +0530 Subject: asf_tcp_nf: Patch to correct typecast in tcp timestamp copy. Earlier tcp timestamp is typecasted using long. But timestamp is of 4 byte. For 64-bit machine, long is 8 byte. This is incorrect So it is typecasted using int. Signed-off-by: Alok Makhariya diff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c index 891070e..a3e1900 100644 --- a/net/netfilter/nf_conntrack_proto_tcp.c +++ b/net/netfilter/nf_conntrack_proto_tcp.c @@ -736,7 +736,7 @@ static bool tcp_in_window(const struct nf_conn *ct, break; case TCPOPT_TIMESTAMP: state->seen[dir].td_tcptimestamp = - ntohl(*((unsigned long *) + ntohl(*((unsigned int *) (tcpopt + 2))); goto DONE; default: -- cgit v0.10.2