summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlok Makhariya <B46187@freescale.com>2015-10-30 08:56:27 (GMT)
committerAlok Makhariya <B46187@freescale.com>2015-10-30 08:56:27 (GMT)
commite03bbdd315a34dbbe37675be15e6add2e96675a5 (patch)
tree87562ba3341675385d3b2047828537119f17f84f
parent91aade93b62b767ad5218735feaa5a4b8e657902 (diff)
downloadlinux-fsl-qoriq-e03bbdd315a34dbbe37675be15e6add2e96675a5.tar.xz
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 <B46187@freescale.com>
-rw-r--r--net/netfilter/nf_conntrack_proto_tcp.c2
1 files changed, 1 insertions, 1 deletions
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: