From: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Date: Thu, 10 Sep 2015 11:54:58 +0000 (+0530)
Subject: staging: dgap: fix possible NULL dereference
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=39be6b8b0cc84b33cd17bc570e80a25126f87c9c;p=deliverable%2Flinux.git

staging: dgap: fix possible NULL dereference

The return pointer from dgap_getword() is used in strcmp() where it is
dereferenced. But dgap_getword() can return NULL.
Lets put a check there and return 0 as error.

Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/dgap/dgap.c b/drivers/staging/dgap/dgap.c
index 9112dd2bf4d7..20ba258ffbdb 100644
--- a/drivers/staging/dgap/dgap.c
+++ b/drivers/staging/dgap/dgap.c
@@ -349,6 +349,8 @@ static int dgap_gettok(char **in)
 
 	if (strstr(dgap_cword, "board")) {
 		w = dgap_getword(in);
+		if (!w)
+			return 0;
 		snprintf(dgap_cword, MAXCWORD, "%s", w);
 		for (t = dgap_brdtype; t->token != 0; t++) {
 			if (!strcmp(w, t->string))