Module Name: src
Committed By: maxv
Date: Mon Mar 12 12:45:26 UTC 2018
Modified Files:
src/sys/net/npf: npf_alg_icmp.c
Log Message:
Remove dead branches, 'npc' can't be NULL (and it is dereferenced
earlier).
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/net/npf/npf_alg_icmp.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_alg_icmp.c
diff -u src/sys/net/npf/npf_alg_icmp.c:1.25 src/sys/net/npf/npf_alg_icmp.c:1.26
--- src/sys/net/npf/npf_alg_icmp.c:1.25 Sun Dec 10 00:07:36 2017
+++ src/sys/net/npf/npf_alg_icmp.c Mon Mar 12 12:45:26 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_alg_icmp.c,v 1.25 2017/12/10 00:07:36 rmind Exp $ */
+/* $NetBSD: npf_alg_icmp.c,v 1.26 2018/03/12 12:45:26 maxv Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#ifdef _KERNEL
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf_alg_icmp.c,v 1.25 2017/12/10 00:07:36 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_alg_icmp.c,v 1.26 2018/03/12 12:45:26 maxv Exp $");
#include <sys/param.h>
#include <sys/module.h>
@@ -135,9 +135,6 @@ npfa_icmp4_inspect(const int type, npf_c
case ICMP_REDIRECT:
case ICMP_TIMXCEED:
case ICMP_PARAMPROB:
- if (npc == NULL) {
- return false;
- }
/* Should contain original IP header. */
if (!nbuf_advance(nbuf, offsetof(struct icmp, icmp_ip), 0)) {
return false;
@@ -175,9 +172,6 @@ npfa_icmp6_inspect(const int type, npf_c
case ICMP6_PACKET_TOO_BIG:
case ICMP6_TIME_EXCEEDED:
case ICMP6_PARAM_PROB:
- if (npc == NULL) {
- return false;
- }
/* Should contain original IP header. */
if (!nbuf_advance(nbuf, sizeof(struct icmp6_hdr), 0)) {
return false;
