From patchwork Wed Aug 14 15:12:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Balantzyan X-Patchwork-Id: 11094147 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BAE636C5 for ; Wed, 14 Aug 2019 15:12:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9EB7B204FF for ; Wed, 14 Aug 2019 15:12:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9231728671; Wed, 14 Aug 2019 15:12:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9B2FA204FF for ; Wed, 14 Aug 2019 15:12:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727815AbfHNPMt (ORCPT ); Wed, 14 Aug 2019 11:12:49 -0400 Received: from mail-pl1-f195.google.com ([209.85.214.195]:39910 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726230AbfHNPMt (ORCPT ); Wed, 14 Aug 2019 11:12:49 -0400 Received: by mail-pl1-f195.google.com with SMTP id z3so4019092pln.6; Wed, 14 Aug 2019 08:12:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=NKpqOapAWm4LEktIkgNSd0a4A6OSDVbmFmubwx0bM4o=; b=FHpRsnidVdozUMiYu59fBeSbgrCbEPSKG/nJqx/f7Ts1xOfzCUezSDLK751X+ZCLsE w7Q4z18mBJoyCqDuWoC1kqeCZRY33hbwFVsb+/xVJDA1+1laxJW1j1geLFcGnVdGSj2N a2r+EG1dW3mt3nk2QiTje4jr0TnnRrT8em+aa1GSVe6mdcD5TcJ88EQHqgpbViCtgB8C 1qVIJDt33kN9M++AVfNedFvvXlVI6fLBAvgZMXT2i52KxKAoSu7bnalO5MxMQUYWPzvN x2L9FOpNSZWU2eejVnDimyLC73/F7gHHpgYfmMba/7Z7LCg4uB6sNuqVzzvtxU6wcMV7 m19A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=NKpqOapAWm4LEktIkgNSd0a4A6OSDVbmFmubwx0bM4o=; b=JGGZ0MP7ggXL5BE+IvnhRlD4eBegC3giHCwpdcoEV7j3RIAV+ITnoReRxqHEIsMle0 dNu2vdHn46uht7ncw19N9xyoto0TwIYfkr+uplMcTOQq9htGx4Cd7uCiDtPxT0Uc93kw t2/1qAcerr/kN0Hk0Qq8frwo5Xm5wydk90UYU7UDuU3yj5EV+oTIcRdeX091Usd4sGGU AlwVSB/H1lud+ZRA0DBNvLHJb9JN0d3OXjctYYqtUIP/ZrkLtNjTIWo5IyV0SA4I3Qjm x2ZchbohjqwbaZqgtKi+Nczycg32TcKvRNN0zp+eN7nlwd+NREwbYiM5086b6mQQuknP W8EQ== X-Gm-Message-State: APjAAAVr5qXFdzrmeddwIwi61yw0ctt3YrbFZuim8AVZL58q0k8XRy7f wLpxzpoLUXpFY1uMWWQWk4M= X-Google-Smtp-Source: APXvYqyR+EQgC0JeCLVXrXHG9Qa4743PAbKQcl6n31YL5dCITQCF8vy3YqDxxTRvU++H2eePeo2r5w== X-Received: by 2002:a17:902:b789:: with SMTP id e9mr42222173pls.294.1565795568672; Wed, 14 Aug 2019 08:12:48 -0700 (PDT) Received: from localhost.localdomain (d206-116-172-62.bchsia.telus.net. [206.116.172.62]) by smtp.gmail.com with ESMTPSA id f14sm113683pfn.53.2019.08.14.08.12.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Aug 2019 08:12:48 -0700 (PDT) From: Mark Balantzyan To: sathya.prakash@broadcom.com Cc: suganath-prabu.subramani@broadcom.com, MPT=FusionLinux.pdl@broadcom.com, linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, Mark Balantzyan Subject: [PATCH] lsilogic mpt fusion: mptctl: Fixed race condition around mptctl_id variable using mutexes Date: Wed, 14 Aug 2019 08:12:41 -0700 Message-Id: <20190814151241.37141-1-mbalant3@gmail.com> X-Mailer: git-send-email 2.17.1 Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Certain functions in the driver, such as mptctl_do_fw_download() and mptctl_do_mpt_command(), rely on the instance of mptctl_id, which does the id-ing. There is race condition possible when these functions operate in concurrency. Via, mutexes, the functions are mutually signalled to cooperate. Signed-off-by: Mark Balantzyan --- drivers/message/fusion/mptctl.c | 36 ++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/drivers/message/fusion/mptctl.c b/drivers/message/fusion/mptctl.c index 4470630d..58ce0fc0 100644 --- a/drivers/message/fusion/mptctl.c +++ b/drivers/message/fusion/mptctl.c @@ -816,12 +816,15 @@ mptctl_do_fw_download(int ioc, char __user *ufwbuf, size_t fwlen) /* Valid device. Get a message frame and construct the FW download message. */ + mutex_lock(&mpctl_mutex); if ((mf = mpt_get_msg_frame(mptctl_id, iocp)) == NULL) + mutex_unlock(&mpctl_mutex); return -EAGAIN; } - + mutex_lock(&mpctl_mutex); dctlprintk(iocp, printk(MYIOC_s_DEBUG_FMT "mptctl_do_fwdl called. mptctl_id = %xh.\n", iocp->name, mptctl_id)); + mutex_unlock(&mpctl_mutex); dctlprintk(iocp, printk(MYIOC_s_DEBUG_FMT "DbG: kfwdl.bufp = %p\n", iocp->name, ufwbuf)); dctlprintk(iocp, printk(MYIOC_s_DEBUG_FMT "DbG: kfwdl.fwlen = %d\n", @@ -943,7 +946,9 @@ mptctl_do_fw_download(int ioc, char __user *ufwbuf, size_t fwlen) ReplyMsg = NULL; SET_MGMT_MSG_CONTEXT(iocp->ioctl_cmds.msg_context, dlmsg->MsgContext); INITIALIZE_MGMT_STATUS(iocp->ioctl_cmds.status) + mutex_lock(&mpctl_mutex); mpt_put_msg_frame(mptctl_id, iocp, mf); + mutex_lock(&mpctl_mutex); /* Now wait for the command to complete */ retry_wait: @@ -1889,7 +1894,9 @@ mptctl_do_mpt_command (struct mpt_ioctl_command karg, void __user *mfPtr) /* Get a free request frame and save the message context. */ + mutex_lock(&mpctl_mutex); if ((mf = mpt_get_msg_frame(mptctl_id, ioc)) == NULL) + mutex_unlock(&mpctl_mutex); return -EAGAIN; hdr = (MPIHeader_t *) mf; @@ -2271,11 +2278,14 @@ mptctl_do_mpt_command (struct mpt_ioctl_command karg, void __user *mfPtr) DBG_DUMP_TM_REQUEST_FRAME(ioc, (u32 *)mf); if ((ioc->facts.IOCCapabilities & MPI_IOCFACTS_CAPABILITY_HIGH_PRI_Q) && - (ioc->facts.MsgVersion >= MPI_VERSION_01_05)) + (ioc->facts.MsgVersion >= MPI_VERSION_01_05)) { + mutex_lock(&mpctl_mutex); mpt_put_msg_frame_hi_pri(mptctl_id, ioc, mf); - else { - rc =mpt_send_handshake_request(mptctl_id, ioc, - sizeof(SCSITaskMgmt_t), (u32*)mf, CAN_SLEEP); + mutex_unlock(&mpctl_mutex); + } else { + mutex_lock(&mpctl_mutex); + rc = mpt_send_handshake_request(mptctl_id, ioc, sizeof(SCSITaskMgmt_t), (u32 *)mf, CAN_SLEEP); + mutex_unlock(&mpctl_mutex); if (rc != 0) { dfailprintk(ioc, printk(MYIOC_s_ERR_FMT "send_handshake FAILED! (ioc %p, mf %p)\n", @@ -2288,7 +2298,9 @@ mptctl_do_mpt_command (struct mpt_ioctl_command karg, void __user *mfPtr) } } else + mutex_lock(&mpctl_mutex); mpt_put_msg_frame(mptctl_id, ioc, mf); + mutex_unlock(&mpctl_mutex); /* Now wait for the command to complete */ timeout = (karg.timeout > 0) ? karg.timeout : MPT_IOCTL_DEFAULT_TIMEOUT; @@ -2563,7 +2575,9 @@ mptctl_hp_hostinfo(unsigned long arg, unsigned int data_size) /* * Gather ISTWI(Industry Standard Two Wire Interface) Data */ + mutex_lock(&mpctl_mutex); if ((mf = mpt_get_msg_frame(mptctl_id, ioc)) == NULL) { + mutex_unlock(&mpctl_mutex); dfailprintk(ioc, printk(MYIOC_s_WARN_FMT "%s, no msg frames!!\n", ioc->name, __func__)); goto out; @@ -2593,7 +2607,9 @@ mptctl_hp_hostinfo(unsigned long arg, unsigned int data_size) SET_MGMT_MSG_CONTEXT(ioc->ioctl_cmds.msg_context, IstwiRWRequest->MsgContext); INITIALIZE_MGMT_STATUS(ioc->ioctl_cmds.status) + mutex_lock(&mpctl_mutex); mpt_put_msg_frame(mptctl_id, ioc, mf); + mutex_unlock(&mpctl_mutex); retry_wait: timeleft = wait_for_completion_timeout(&ioc->ioctl_cmds.done, @@ -3010,9 +3026,11 @@ static int __init mptctl_init(void) * Install our handler */ ++where; + mutex_lock(&mpctl_mutex); mptctl_id = mpt_register(mptctl_reply, MPTCTL_DRIVER, "mptctl_reply"); if (!mptctl_id || mptctl_id >= MPT_MAX_PROTOCOL_DRIVERS) { + mutex_unlock(&mpctl_mutex); printk(KERN_ERR MYNAM ": ERROR: Failed to register with Fusion MPT base driver\n"); misc_deregister(&mptctl_miscdev); err = -EBUSY; @@ -3022,13 +3040,14 @@ static int __init mptctl_init(void) mptctl_taskmgmt_id = mpt_register(mptctl_taskmgmt_reply, MPTCTL_DRIVER, "mptctl_taskmgmt_reply"); if (!mptctl_taskmgmt_id || mptctl_taskmgmt_id >= MPT_MAX_PROTOCOL_DRIVERS) { + mutex_unlock(&mpctl_mutex); printk(KERN_ERR MYNAM ": ERROR: Failed to register with Fusion MPT base driver\n"); mpt_deregister(mptctl_id); misc_deregister(&mptctl_miscdev); err = -EBUSY; goto out_fail; } - + mutex_unlock(&mpctl_mutex); mpt_reset_register(mptctl_id, mptctl_ioc_reset); mpt_event_register(mptctl_id, mptctl_event_process); @@ -3044,13 +3063,14 @@ out_fail: /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ static void mptctl_exit(void) { + mutex_lock(&mpctl_mutex); misc_deregister(&mptctl_miscdev); printk(KERN_INFO MYNAM ": Deregistered /dev/%s @ (major,minor=%d,%d)\n", mptctl_miscdev.name, MISC_MAJOR, mptctl_miscdev.minor); /* De-register event handler from base module */ mpt_event_deregister(mptctl_id); - + /* De-register reset handler from base module */ mpt_reset_deregister(mptctl_id); @@ -3058,6 +3078,8 @@ static void mptctl_exit(void) mpt_deregister(mptctl_taskmgmt_id); mpt_deregister(mptctl_id); + mutex_unlock(&mpctl_mutex); + mpt_device_driver_deregister(MPTCTL_DRIVER); }