Module Name: src
Committed By: christos
Date: Sun Feb 18 21:51:28 UTC 2018
Modified Files:
src/sys/dist/pf/net: pf.c
Log Message:
PR/53036: Alexander Nasonov: 'block user' in pf's ruleset panics 8.0_BETA
Check for NULL.
To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/sys/dist/pf/net/pf.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/dist/pf/net/pf.c
diff -u src/sys/dist/pf/net/pf.c:1.78 src/sys/dist/pf/net/pf.c:1.79
--- src/sys/dist/pf/net/pf.c:1.78 Fri Feb 9 16:25:04 2018
+++ src/sys/dist/pf/net/pf.c Sun Feb 18 16:51:28 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pf.c,v 1.78 2018/02/09 21:25:04 maxv Exp $ */
+/* $NetBSD: pf.c,v 1.79 2018/02/18 21:51:28 christos Exp $ */
/* $OpenBSD: pf.c,v 1.552.2.1 2007/11/27 16:37:57 henning Exp $ */
/*
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pf.c,v 1.78 2018/02/09 21:25:04 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pf.c,v 1.79 2018/02/18 21:51:28 christos Exp $");
#include "pflog.h"
@@ -2847,6 +2847,13 @@ pf_socket_lookup(int direction, struct p
break;
#endif /* INET6 */
}
+ if (so == NULL)
+ return -1;
+ if (so->so_cred == NULL) {
+ DPFPRINTF(PF_DEBUG_URGENT,
+ ("%s: so->so_cred == NULL so=%p\n", __func__, so));
+ return -1;
+ }
pd->lookup.uid = kauth_cred_geteuid(so->so_cred);
pd->lookup.gid = kauth_cred_getegid(so->so_cred);
#else
