CVS commit: src/sys/kern

[SAITOH Masanobu]

Module Name:    src
Committed By:   msaitoh
Date:           Wed Jul  4 07:25:47 UTC 2018

Modified Files:
        src/sys/kern: kern_cpu.c

Log Message:
 Don't allocate memory and return EFTYPE if sc->sc_blobsize==0 to prevent
panic in firmware_malloc().


To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 src/sys/kern/kern_cpu.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/kern/kern_cpu.c
diff -u src/sys/kern/kern_cpu.c:1.73 src/sys/kern/kern_cpu.c:1.74
--- src/sys/kern/kern_cpu.c:1.73	Sun Mar 18 00:51:46 2018
+++ src/sys/kern/kern_cpu.c	Wed Jul  4 07:25:47 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_cpu.c,v 1.73 2018/03/18 00:51:46 christos Exp $	*/
+/*	$NetBSD: kern_cpu.c,v 1.74 2018/07/04 07:25:47 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 2007, 2008, 2009, 2010, 2012 The NetBSD Foundation, Inc.
@@ -56,7 +56,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_cpu.c,v 1.73 2018/03/18 00:51:46 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_cpu.c,v 1.74 2018/07/04 07:25:47 msaitoh Exp $");
 
 #include "opt_cpu_ucode.h"
 
@@ -602,6 +602,11 @@ cpu_ucode_load(struct cpu_ucode_softc *s
 	}
 
 	sc->sc_blobsize = firmware_get_size(fwh);
+	if (sc->sc_blobsize == 0) {
+		error = EFTYPE;
+		firmware_close(fwh);
+		goto err0;
+	}
 	sc->sc_blob = firmware_malloc(sc->sc_blobsize);
 	if (sc->sc_blob == NULL) {
 		error = ENOMEM;