Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 3 Jun 2019 04:36:58 +0000 (UTC)
From:      Cy Schubert <cy@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject:   svn commit: r348523 - stable/12/sys/contrib/ipfilter/netinet
Message-ID:  <201906030436.x534awH3027847@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: cy
Date: Mon Jun  3 04:36:57 2019
New Revision: 348523
URL: https://svnweb.freebsd.org/changeset/base/348523

Log:
  MFC r348311:
  
  Fix indentation and while at it simplfy the code.
  
  Reported by:	lwhsu@

Modified:
  stable/12/sys/contrib/ipfilter/netinet/fil.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/contrib/ipfilter/netinet/fil.c
==============================================================================
--- stable/12/sys/contrib/ipfilter/netinet/fil.c	Mon Jun  3 04:35:28 2019	(r348522)
+++ stable/12/sys/contrib/ipfilter/netinet/fil.c	Mon Jun  3 04:36:57 2019	(r348523)
@@ -4982,16 +4982,16 @@ frrequest(softc, unit, req, data, set, makecopy)
 			error = ipf_outobj(softc, data, fp, IPFOBJ_FRENTRY);
 
 			if (error == 0) {
-				if ((f->fr_dsize != 0) && (uptr != NULL))
+				if ((f->fr_dsize != 0) && (uptr != NULL)) {
 					error = COPYOUT(f->fr_data, uptr,
 							f->fr_dsize);
-					if (error != 0) {
+					if (error == 0) {
+						f->fr_hits = 0;
+						f->fr_bytes = 0;
+					} else {
 						IPFERROR(28);
 						error = EFAULT;
 					}
-				if (error == 0) {
-					f->fr_hits = 0;
-					f->fr_bytes = 0;
 				}
 			}
 		}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201906030436.x534awH3027847>