Module Name: src
Committed By: riastradh
Date: Fri Apr 22 19:40:55 UTC 2016
Modified Files:
src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/mxm:
nouveau_subdev_mxm_mxms.c
Log Message:
Avoid possible null pointer dereference.
Found by Coverity, CID 709895.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/mxm/nouveau_subdev_mxm_mxms.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/external/bsd/drm2/dist/drm/nouveau/core/subdev/mxm/nouveau_subdev_mxm_mxms.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/mxm/nouveau_subdev_mxm_mxms.c:1.1.1.1 src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/mxm/nouveau_subdev_mxm_mxms.c:1.2
--- src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/mxm/nouveau_subdev_mxm_mxms.c:1.1.1.1 Wed Aug 6 12:36:31 2014
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/mxm/nouveau_subdev_mxm_mxms.c Fri Apr 22 19:40:55 2016
@@ -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 @@ mxms_foreach(struct nouveau_mxm *mxm, u8
}
}
- if (types & (1 << type)) {
+ if ((types & (1 << type)) && (exec != NULL)) {
if (!exec(mxm, desc, info))
return false;
}
