CVS commit: src/sys/netipsec

[Ryota Ozaki]

Module Name:    src
Committed By:   ozaki-r
Date:           Tue Jan 23 02:17:32 UTC 2018

Modified Files:
        src/sys/netipsec: ipsec.c

Log Message:
Fix late NULL-checking (CID 1427782: Null pointer dereferences (REVERSE_INULL))


To generate a diff of this commit:
cvs rdiff -u -r1.123 -r1.124 src/sys/netipsec/ipsec.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/netipsec/ipsec.c
diff -u src/sys/netipsec/ipsec.c:1.123 src/sys/netipsec/ipsec.c:1.124
--- src/sys/netipsec/ipsec.c:1.123	Tue Nov 21 07:03:08 2017
+++ src/sys/netipsec/ipsec.c	Tue Jan 23 02:17:32 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: ipsec.c,v 1.123 2017/11/21 07:03:08 ozaki-r Exp $	*/
+/*	$NetBSD: ipsec.c,v 1.124 2018/01/23 02:17:32 ozaki-r Exp $	*/
 /*	$FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/netipsec/ipsec.c,v 1.2.2.2 2003/07/01 01:38:13 sam Exp $	*/
 /*	$KAME: ipsec.c,v 1.103 2001/05/24 07:14:18 sakane Exp $	*/
 
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.123 2017/11/21 07:03:08 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.124 2018/01/23 02:17:32 ozaki-r Exp $");
 
 /*
  * IPsec controller part.
@@ -1444,11 +1444,10 @@ ipsec4_set_policy(struct inpcb *inp, int
 	struct secpolicy **policy;
 
 	KASSERT(!cpu_softintr_p());
+	KASSERT(inp != NULL);
 	KASSERT(inp_locked(inp));
+	KASSERT(request != NULL);
 
-	/* sanity check. */
-	if (inp == NULL || request == NULL)
-		return EINVAL;
 	if (len < sizeof(*xpl))
 		return EINVAL;
 	xpl = (const struct sadb_x_policy *)request;