Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 503df2c4 authored by Dmitry Eremin's avatar Dmitry Eremin Committed by Greg Kroah-Hartman
Browse files

staging: lustre: lmv: fix issue found by Klocwork Insight tool 



'plock.cookie' might be used uninitialized in this function.

sscanf format specification '%d' expects type 'int *' for 'd',
but parameter 3 has a different type '__u32*'

Signed-off-by: default avatarDmitry Eremin <dmitry.eremin@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-4629
Reviewed-on: http://review.whamcloud.com/9390


Reviewed-by: default avatarJohn L. Hammond <john.hammond@intel.com>
Reviewed-by: default avatarJames Simmons <uja.ornl@gmail.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 79496845

drivers/staging/lustre/lustre/lmv/lmv_intent.c

+4 −2
Original line number Diff line number Diff line
@@ -137,8 +137,10 @@ static int lmv_intent_remote(struct obd_export *exp, void *lmm, 
		it->it_remote_lock_mode = it->it_lock_mode;

	}



	if (pmode) {

		it->it_lock_handle = plock.cookie;

		it->it_lock_mode = pmode;

	}



out_free_op_data:

	kfree(op_data);

drivers/staging/lustre/lustre/lmv/lmv_obd.c

+1 −1
Original line number Diff line number Diff line
@@ -1419,7 +1419,7 @@ static int lmv_process_config(struct obd_device *obd, u32 len, void *buf) 


		obd_str2uuid(&obd_uuid,  lustre_cfg_buf(lcfg, 1));



		if (sscanf(lustre_cfg_buf(lcfg, 2), "%d", &index) != 1) {

		if (sscanf(lustre_cfg_buf(lcfg, 2), "%u", &index) != 1) {

			rc = -EINVAL;

			goto out;

		}