From 9593bae2e960d3e15f4959d8ec66d123aa939dda Mon Sep 17 00:00:00 2001
From: avos <avos@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Mon, 4 Feb 2019 03:44:07 +0000
Subject: [PATCH] MFC r343576: ndiscvt(8): abort if no IDs were found during
 conversion.

PR:		69268
Submitted by:	<darius@dons.net.au>


git-svn-id: svn://svn.freebsd.org/base/stable/10@343730 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 usr.sbin/ndiscvt/inf.c     | 26 ++++++++++++++------------
 usr.sbin/ndiscvt/ndiscvt.c |  3 ++-
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/usr.sbin/ndiscvt/inf.c b/usr.sbin/ndiscvt/inf.c
index 4b30da0a3..668c36ac9 100644
--- a/usr.sbin/ndiscvt/inf.c
+++ b/usr.sbin/ndiscvt/inf.c
@@ -60,9 +60,9 @@ static struct assign
 				(struct assign *);
 static struct section
 		*find_section	(const char *);
-static void	dump_deviceids_pci	(void);
-static void	dump_deviceids_pcmcia	(void);
-static void	dump_deviceids_usb	(void);
+static int	dump_deviceids_pci	(void);
+static int	dump_deviceids_pcmcia	(void);
+static int	dump_deviceids_usb	(void);
 static void	dump_pci_id	(const char *);
 static void	dump_pcmcia_id	(const char *);
 static void	dump_usb_id	(const char *);
@@ -83,9 +83,11 @@ inf_parse (FILE *fp, FILE *outfp)
 	yyin = fp;
 	yyparse();
 
-	dump_deviceids_pci();
-	dump_deviceids_pcmcia();
-	dump_deviceids_usb();
+	if (dump_deviceids_pci() == 0 &&
+	    dump_deviceids_pcmcia() == 0 &&
+	    dump_deviceids_usb() == 0)
+		return (-1);
+
 	fprintf(outfp, "#ifdef NDIS_REGVALS\n");
 	dump_regvals();
 	fprintf(outfp, "#endif /* NDIS_REGVALS */\n");
@@ -278,7 +280,7 @@ dump_usb_id(const char *s)
 	fprintf(ofp, "\t\\\n\t{ %s, %s, ", vidstr, pidstr);
 }
 
-static void
+static int
 dump_deviceids_pci()
 {
 	struct assign *manf, *dev;
@@ -368,10 +370,10 @@ done:
 
 	fprintf(ofp, "\n\n");
 
-	return;
+	return (found);
 }
 
-static void
+static int
 dump_deviceids_pcmcia()
 {
 	struct assign *manf, *dev;
@@ -461,10 +463,10 @@ done:
 
 	fprintf(ofp, "\n\n");
 
-	return;
+	return (found);
 }
 
-static void
+static int
 dump_deviceids_usb()
 {
 	struct assign *manf, *dev;
@@ -554,7 +556,7 @@ done:
 
 	fprintf(ofp, "\n\n");
 
-	return;
+	return (found);
 }
 
 static void
diff --git a/usr.sbin/ndiscvt/ndiscvt.c b/usr.sbin/ndiscvt/ndiscvt.c
index 7636c4c75..f6b1038f1 100644
--- a/usr.sbin/ndiscvt/ndiscvt.c
+++ b/usr.sbin/ndiscvt/ndiscvt.c
@@ -369,7 +369,8 @@ main(int argc, char *argv[])
 			err(1, "opening .INF file '%s' failed", inffile);
 
 
-		inf_parse(fp, outfp);
+		if (inf_parse(fp, outfp) != 0)
+			errx(1, "creating .INF file - no entries created, are you using the correct files?");
 		fclose(fp);
 	}
 
-- 
2.42.0