svn commit: r341225 - stable/12/stand/common

[Toomas Soome]

Author: tsoome
Date: Thu Nov 29 13:01:21 2018
New Revision: 341225
URL: https://svnweb.freebsd.org/changeset/base/341225

Log:
  MFC: r340240:
  loader: ptable_open() check for ptable_cd9660read result is wrong
  
  The ptable_*read() functions return NULL on read errors (and partition table
  closed as an side effect). The ptable_open must check the return value and
  act properly.
  
  PR:		232483
  Reported by:	lev
  Reviewed by:	lev,cem
  Differential Revision:	https://reviews.freebsd.org/D17890

Modified:
  stable/12/stand/common/part.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/stand/common/part.c
==============================================================================
--- stable/12/stand/common/part.c	Thu Nov 29 12:12:42 2018	(r341224)
+++ stable/12/stand/common/part.c	Thu Nov 29 13:01:21 2018	(r341225)
@@ -676,10 +676,12 @@ ptable_open(void *dev, uint64_t sectors, uint16_t sect
 	table->type = PTABLE_NONE;
 	STAILQ_INIT(&table->entries);
 
-	if (ptable_iso9660read(table, dev, dread) != NULL) {
-		if (table->type == PTABLE_ISO9660)
-			goto out;
-	}
+	if (ptable_iso9660read(table, dev, dread) == NULL) {
+		/* Read error. */
+		table = NULL;
+		goto out;
+	} else if (table->type == PTABLE_ISO9660)
+		goto out;
 
 #ifdef LOADER_VTOC8_SUPPORT
 	if (be16dec(buf + offsetof(struct vtoc8, magic)) == VTOC_MAGIC) {