Commit 0536e2f4 authored by haodongdong's avatar haodongdong
Browse files

LeapIOraid: Fix hiding ugood disk problem 

LeapIO inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/IBE7VU



------------------------------------------

fix hiding ugood disk problem.
fix "The address of local variable 'mpi_request' might be accessed
at non-zero index in function leapioraid_base_send_ioc_init"

Signed-off-by: default avatarhaodongdong <doubled@leap-io.com>
parent e53a23ef

drivers/scsi/leapioraid/leapioraid_app.c

+0 −1
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ 
#include <linux/poll.h>

#include <linux/io.h>

#include <linux/uaccess.h>

#include "leapioraid_func.h"



#ifdef __KERNEL__

#include <linux/miscdevice.h>

drivers/scsi/leapioraid/leapioraid_func.c

+8 −7
Original line number Diff line number Diff line
@@ -4746,14 +4746,11 @@ leapioraid_base_send_ioc_init(struct LEAPIORAID_ADAPTER *ioc) 
	current_time = ktime_get_real();

	mpi_request.TimeStamp = cpu_to_le64(ktime_to_ms(current_time));

	if (ioc->logging_level & LEAPIORAID_DEBUG_INIT) {

		__le32 *mfp;

		int i;



		mfp = (__le32 *) &mpi_request;

		pr_info("%s \toffset:data\n", ioc->name);

		for (i = 0; i < sizeof(struct LeapioraidIOCInitReq_t) / 4; i++)

			pr_info("%s \t[0x%02x]:%08x\n",

			       ioc->name, i * 4, le32_to_cpu(mfp[i]));

		leapioraid_debug_dump_mf(&mpi_request,

				sizeof(struct LeapioraidIOCInitReq_t) / 4);



	}

	r = leapioraid_base_handshake_req_reply_wait(ioc,

						     sizeof
@@ -7022,7 +7019,11 @@ leapioraid_config_get_volume_handle(struct LEAPIORAID_ADAPTER *ioc, 
		r = -1;

		ioc_status = le16_to_cpu(mpi_reply.IOCStatus) &

		    LEAPIORAID_IOCSTATUS_MASK;

		if (ioc_status != LEAPIORAID_IOCSTATUS_SUCCESS)

		if (ioc_status == LEAPIORAID_IOCSTATUS_CONFIG_INVALID_PAGE) {

			*volume_handle = 0;

			r = 0;

			goto out;

		} else if (ioc_status != LEAPIORAID_IOCSTATUS_SUCCESS)

			goto out;

		for (i = 0; i < config_page->NumElements; i++) {

			element_type =

drivers/scsi/leapioraid/leapioraid_func.h

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ 
#define LEAPIORAID_KDUMP_SCSI_IO_DEPTH	(64)

#define LEAPIORAID_RAID_MAX_SECTORS		(128)



#define LEAPIORAID_NAME_LENGTH			(32)

#define LEAPIORAID_NAME_LENGTH			(48)

#define LEAPIORAID_DRIVER_NAME_LENGTH	(24)

#define LEAPIORAID_STRING_LENGTH		(64)