svn commit: r356454 - stable/11/usr.bin/netstat

[Bjoern A. Zeeb]

Author: bz
Date: Tue Jan  7 16:54:53 2020
New Revision: 356454
URL: https://svnweb.freebsd.org/changeset/base/356454

Log:
  MFC r354639:
  
    netstat: igmp stats, error on unexpected information, not only warn
  
    The igmp stats tend to print two lines of warning for an unexpected
    version and length.  Despite an invalid version and struct size it
    continues to try to do something with the data.  Do not try to parse
    the remainder of the struct and error on warning.
  
    Note the underlying issue of the data not being available properly
    is still there and needs to be fixed seperately.
  
    Reported by:  test cases, lwhsu

Modified:
  stable/11/usr.bin/netstat/inet.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/usr.bin/netstat/inet.c
==============================================================================
--- stable/11/usr.bin/netstat/inet.c	Tue Jan  7 16:54:43 2020	(r356453)
+++ stable/11/usr.bin/netstat/inet.c	Tue Jan  7 16:54:53 2020	(r356454)
@@ -1330,10 +1330,12 @@ igmp_stats(u_long off, const char *name, int af1 __unu
 	if (igmpstat.igps_version != IGPS_VERSION_3) {
 		xo_warnx("%s: version mismatch (%d != %d)", __func__,
 		    igmpstat.igps_version, IGPS_VERSION_3);
+		return;
 	}
 	if (igmpstat.igps_len != IGPS_VERSION3_LEN) {
 		xo_warnx("%s: size mismatch (%d != %d)", __func__,
 		    igmpstat.igps_len, IGPS_VERSION3_LEN);
+		return;
 	}
 
 	xo_open_container(name);