From 3fe91cf714bfa2851fd47442da0fa7554277fd66 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Tue, 16 Jun 2015 20:21:22 +0000 Subject: [PATCH] scst_vdisk: Fix error handling in __vdev_load_mode_pages() Avoid that unknown parameters cause __vdev_load_mode_pages() to return 0 instead of -EINVAL. Detected by Coverity. git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@6338 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/src/dev_handlers/scst_vdisk.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/scst/src/dev_handlers/scst_vdisk.c b/scst/src/dev_handlers/scst_vdisk.c index b2ea17676..f90d1ab90 100644 --- a/scst/src/dev_handlers/scst_vdisk.c +++ b/scst/src/dev_handlers/scst_vdisk.c @@ -1217,7 +1217,7 @@ out: /* Params are NULL-terminated */ static int __vdev_load_mode_pages(struct scst_vdisk_dev *virt_dev, char *params) { - int res; + int res = 0; char *param, *p, *pp; unsigned long val; @@ -1252,14 +1252,11 @@ static int __vdev_load_mode_pages(struct scst_vdisk_dev *virt_dev, char *params) else { TRACE_DBG("Unknown parameter %s", p); res = -EINVAL; - break; } if (res != 0) - goto out; + break; } - res = 0; - out: TRACE_EXIT_RES(res); return res;