* [PATCH] md-cluster: fix potential lock issue in add_new_disk
@ 2017-05-16 6:01 Guoqing Jiang
2017-05-18 0:07 ` Shaohua Li
0 siblings, 1 reply; 2+ messages in thread
From: Guoqing Jiang @ 2017-05-16 6:01 UTC (permalink / raw)
To: linux-raid; +Cc: shli, neilb, Guoqing Jiang, Goldwyn Rodrigues
The add_new_disk returns with communication locked if
__sendmsg returns failure, fix it with call unlock_comm
before return.
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
CC: Goldwyn Rodrigues <rgoldwyn@suse.com>
Signed-off-by: Guoqing Jiang <gqjiang@suse.com>
---
drivers/md/md-cluster.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/md/md-cluster.c b/drivers/md/md-cluster.c
index 7299ce2..03082e1 100644
--- a/drivers/md/md-cluster.c
+++ b/drivers/md/md-cluster.c
@@ -1311,8 +1311,10 @@ static int add_new_disk(struct mddev *mddev, struct md_rdev *rdev)
cmsg.raid_slot = cpu_to_le32(rdev->desc_nr);
lock_comm(cinfo, 1);
ret = __sendmsg(cinfo, &cmsg);
- if (ret)
+ if (ret) {
+ unlock_comm(cinfo);
return ret;
+ }
cinfo->no_new_dev_lockres->flags |= DLM_LKF_NOQUEUE;
ret = dlm_lock_sync(cinfo->no_new_dev_lockres, DLM_LOCK_EX);
cinfo->no_new_dev_lockres->flags &= ~DLM_LKF_NOQUEUE;
--
2.6.6
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] md-cluster: fix potential lock issue in add_new_disk
2017-05-16 6:01 [PATCH] md-cluster: fix potential lock issue in add_new_disk Guoqing Jiang
@ 2017-05-18 0:07 ` Shaohua Li
0 siblings, 0 replies; 2+ messages in thread
From: Shaohua Li @ 2017-05-18 0:07 UTC (permalink / raw)
To: Guoqing Jiang; +Cc: linux-raid, shli, neilb, Goldwyn Rodrigues
On Tue, May 16, 2017 at 02:01:25PM +0800, Guoqing Jiang wrote:
> The add_new_disk returns with communication locked if
> __sendmsg returns failure, fix it with call unlock_comm
> before return.
>
> Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
> CC: Goldwyn Rodrigues <rgoldwyn@suse.com>
> Signed-off-by: Guoqing Jiang <gqjiang@suse.com>
queued, thanks!
> ---
> drivers/md/md-cluster.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/md/md-cluster.c b/drivers/md/md-cluster.c
> index 7299ce2..03082e1 100644
> --- a/drivers/md/md-cluster.c
> +++ b/drivers/md/md-cluster.c
> @@ -1311,8 +1311,10 @@ static int add_new_disk(struct mddev *mddev, struct md_rdev *rdev)
> cmsg.raid_slot = cpu_to_le32(rdev->desc_nr);
> lock_comm(cinfo, 1);
> ret = __sendmsg(cinfo, &cmsg);
> - if (ret)
> + if (ret) {
> + unlock_comm(cinfo);
> return ret;
> + }
> cinfo->no_new_dev_lockres->flags |= DLM_LKF_NOQUEUE;
> ret = dlm_lock_sync(cinfo->no_new_dev_lockres, DLM_LOCK_EX);
> cinfo->no_new_dev_lockres->flags &= ~DLM_LKF_NOQUEUE;
> --
> 2.6.6
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-raid" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-05-18 0:07 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-16 6:01 [PATCH] md-cluster: fix potential lock issue in add_new_disk Guoqing Jiang
2017-05-18 0:07 ` Shaohua Li
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).