[src/trunk]: src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/mxm Avoid...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2b112a0d81db
branches:  trunk
changeset: 344822:2b112a0d81db
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Fri Apr 22 19:40:55 2016 +0000

description:
Avoid possible null pointer dereference.

Found by Coverity, CID 709895.

diffstat:

 sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/mxm/nouveau_subdev_mxm_mxms.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 51147f8a0d92 -r 2b112a0d81db sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/mxm/nouveau_subdev_mxm_mxms.c
--- a/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/mxm/nouveau_subdev_mxm_mxms.c  Fri Apr 22 18:25:41 2016 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/mxm/nouveau_subdev_mxm_mxms.c  Fri Apr 22 19:40:55 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nouveau_subdev_mxm_mxms.c,v 1.1.1.1 2014/08/06 12:36:31 riastradh Exp $        */
+/*     $NetBSD: nouveau_subdev_mxm_mxms.c,v 1.2 2016/04/22 19:40:55 riastradh Exp $    */
 
 /*
  * Copyright 2012 Red Hat Inc.
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_subdev_mxm_mxms.c,v 1.1.1.1 2014/08/06 12:36:31 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_subdev_mxm_mxms.c,v 1.2 2016/04/22 19:40:55 riastradh Exp $");
 
 #include <subdev/mxm.h>
 #include "mxms.h"
@@ -173,7 +173,7 @@
                        }
                }
 
-               if (types & (1 << type)) {
+               if ((types & (1 << type)) && (exec != NULL)) {
                        if (!exec(mxm, desc, info))
                                return false;
                }