CVS commit: src/sys/netinet

[Kamil Rytarowski]

Module Name:    src
Committed By:   kamil
Date:           Sat Jun  1 15:18:42 UTC 2019

Modified Files:
        src/sys/netinet: tcp_input.c

Log Message:
Replace potentially misaligned pointer dereference + htonl() with be32dec()

Reported by kUBSan.


To generate a diff of this commit:
cvs rdiff -u -r1.413 -r1.414 src/sys/netinet/tcp_input.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/netinet/tcp_input.c
diff -u src/sys/netinet/tcp_input.c:1.413 src/sys/netinet/tcp_input.c:1.414
--- src/sys/netinet/tcp_input.c:1.413	Thu Nov  8 06:43:52 2018
+++ src/sys/netinet/tcp_input.c	Sat Jun  1 15:18:42 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: tcp_input.c,v 1.413 2018/11/08 06:43:52 msaitoh Exp $	*/
+/*	$NetBSD: tcp_input.c,v 1.414 2019/06/01 15:18:42 kamil Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -148,7 +148,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.413 2018/11/08 06:43:52 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.414 2019/06/01 15:18:42 kamil Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -1350,11 +1350,11 @@ tcp_input(struct mbuf *m, int off, int p
 		if ((optlen == TCPOLEN_TSTAMP_APPA ||
 		     (optlen > TCPOLEN_TSTAMP_APPA &&
 		      optp[TCPOLEN_TSTAMP_APPA] == TCPOPT_EOL)) &&
-		    *(u_int32_t *)optp == htonl(TCPOPT_TSTAMP_HDR) &&
+		    be32dec(optp) == TCPOPT_TSTAMP_HDR &&
 		    (th->th_flags & TH_SYN) == 0) {
 			opti.ts_present = 1;
-			opti.ts_val = ntohl(*(u_int32_t *)(optp + 4));
-			opti.ts_ecr = ntohl(*(u_int32_t *)(optp + 8));
+			opti.ts_val = be32dec(optp + 4);
+			opti.ts_ecr = be32dec(optp + 8);
 			optp = NULL;	/* we've parsed the options */
 		}
 	}