svn commit: r361831 - stable/12/sys/netpfil/ipfw

[Andrey V. Elsukov]

Author: ae
Date: Fri Jun  5 09:56:51 2020
New Revision: 361831
URL: https://svnweb.freebsd.org/changeset/base/361831

Log:
  MFC r361624:
    Fix O_IP_FLOW_LOOKUP opcode handling.
  
    Do not check table value matching when table lookup has failed.

Modified:
  stable/12/sys/netpfil/ipfw/ip_fw2.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/netpfil/ipfw/ip_fw2.c
==============================================================================
--- stable/12/sys/netpfil/ipfw/ip_fw2.c	Fri Jun  5 08:46:55 2020	(r361830)
+++ stable/12/sys/netpfil/ipfw/ip_fw2.c	Fri Jun  5 09:56:51 2020	(r361831)
@@ -2068,6 +2068,8 @@ do {						\
 					uint32_t v = 0;
 					match = ipfw_lookup_table(chain,
 					    cmd->arg1, 0, &args->f_id, &v);
+					if (!match)
+						break;
 					if (cmdlen == F_INSN_SIZE(ipfw_insn_u32))
 						match = ((ipfw_insn_u32 *)cmd)->d[0] ==
 						    TARG_VAL(chain, v, tag);