Module Name:    src
Committed By:   maxv
Date:           Fri Apr  6 14:50:55 UTC 2018

Modified Files:
        src/sys/net/npf: npf_inet.c

Log Message:
If we're trying to read the mss on a packet that for some reason has two
MAXSEG options, we find ourselves patching the second option with the
value of the first one.

Fix that by using a local variable.


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/net/npf/npf_inet.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/net/npf/npf_inet.c
diff -u src/sys/net/npf/npf_inet.c:1.47 src/sys/net/npf/npf_inet.c:1.48
--- src/sys/net/npf/npf_inet.c:1.47	Fri Mar 23 08:28:54 2018
+++ src/sys/net/npf/npf_inet.c	Fri Apr  6 14:50:55 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: npf_inet.c,v 1.47 2018/03/23 08:28:54 maxv Exp $	*/
+/*	$NetBSD: npf_inet.c,v 1.48 2018/04/06 14:50:55 maxv Exp $	*/
 
 /*-
  * Copyright (c) 2009-2014 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
 
 #ifdef _KERNEL
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf_inet.c,v 1.47 2018/03/23 08:28:54 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_inet.c,v 1.48 2018/04/06 14:50:55 maxv Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -230,6 +230,7 @@ npf_fetch_tcpopts(npf_cache_t *npc, uint
 	nbuf_t *nbuf = npc->npc_nbuf;
 	const struct tcphdr *th = npc->npc_l4.tcp;
 	int topts_len, step;
+	bool setmss = false;
 	uint8_t *nptr;
 	uint8_t val;
 	bool ok;
@@ -245,6 +246,11 @@ npf_fetch_tcpopts(npf_cache_t *npc, uint
 	}
 	KASSERT(topts_len <= MAX_TCPOPTLEN);
 
+	/* Determine if we want to set or get the mss. */
+	if (mss) {
+		setmss = (*mss != 0);
+	}
+
 	/* First step: IP and TCP header up to options. */
 	step = npc->npc_hlen + sizeof(struct tcphdr);
 	nbuf_reset(nbuf);
@@ -270,7 +276,7 @@ next:
 			goto done;
 		}
 		if (mss) {
-			if (*mss) {
+			if (setmss) {
 				memcpy(nptr + 2, mss, sizeof(uint16_t));
 			} else {
 				memcpy(mss, nptr + 2, sizeof(uint16_t));

Reply via email to