From: Dan Carpenter <dan.carpenter@oracle.com>
To: Philipp Reisner <philipp.reisner@linbit.com>
Cc: Lars Ellenberg <lars.ellenberg@linbit.com>,
Jens Axboe <axboe@kernel.dk>,
drbd-dev@tron.linbit.com, linux-block@vger.kernel.org,
linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: [PATCH] block: drbd: remove a stay unlock in __drbd_send_protocol()
Date: Thu, 07 Nov 2019 07:48:47 +0000 [thread overview]
Message-ID: <20191107074847.GA11695@mwanda> (raw)
There are two callers of this function and they both unlock the mutex so
this ends up being a double unlock.
Fixes: 44ed167da748 ("drbd: rcu_read_lock() and rcu_dereference() for tconn->net_conf")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
Static analisys. Not tested. There is a comment about the lock next to
the caller in drbd_nl.c that I didn't understand:
drivers/block/drbd/drbd_nl.c
2509 crypto_free_shash(connection->integrity_tfm);
2510 connection->integrity_tfm = crypto.integrity_tfm;
2511 if (connection->cstate >= C_WF_REPORT_PARAMS && connection->agreed_pro_version >= 100)
2512 /* Do this without trying to take connection->data.mutex again. */
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
What does this mean? We're already holding that lock. We took it near
the start of the function.
2513 __drbd_send_protocol(connection, P_PROTOCOL_UPDATE);
2514
2515 crypto_free_shash(connection->cram_hmac_tfm);
2516 connection->cram_hmac_tfm = crypto.cram_hmac_tfm;
2517
2518 mutex_unlock(&connection->resource->conf_update);
2519 mutex_unlock(&connection->data.mutex);
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Unlocked here.
drivers/block/drbd/drbd_main.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index 5b248763a672..a18155cdce41 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -786,7 +786,6 @@ int __drbd_send_protocol(struct drbd_connection *connection, enum drbd_packet cm
if (nc->tentative && connection->agreed_pro_version < 92) {
rcu_read_unlock();
- mutex_unlock(&sock->mutex);
drbd_err(connection, "--dry-run is not supported by peer");
return -EOPNOTSUPP;
}
--
2.20.1
WARNING: multiple messages have this Message-ID (diff)
From: Dan Carpenter <dan.carpenter@oracle.com>
To: Philipp Reisner <philipp.reisner@linbit.com>
Cc: Lars Ellenberg <lars.ellenberg@linbit.com>,
Jens Axboe <axboe@kernel.dk>,
drbd-dev@tron.linbit.com, linux-block@vger.kernel.org,
linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: [PATCH] block: drbd: remove a stay unlock in __drbd_send_protocol()
Date: Thu, 7 Nov 2019 10:48:47 +0300 [thread overview]
Message-ID: <20191107074847.GA11695@mwanda> (raw)
There are two callers of this function and they both unlock the mutex so
this ends up being a double unlock.
Fixes: 44ed167da748 ("drbd: rcu_read_lock() and rcu_dereference() for tconn->net_conf")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
Static analisys. Not tested. There is a comment about the lock next to
the caller in drbd_nl.c that I didn't understand:
drivers/block/drbd/drbd_nl.c
2509 crypto_free_shash(connection->integrity_tfm);
2510 connection->integrity_tfm = crypto.integrity_tfm;
2511 if (connection->cstate >= C_WF_REPORT_PARAMS && connection->agreed_pro_version >= 100)
2512 /* Do this without trying to take connection->data.mutex again. */
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
What does this mean? We're already holding that lock. We took it near
the start of the function.
2513 __drbd_send_protocol(connection, P_PROTOCOL_UPDATE);
2514
2515 crypto_free_shash(connection->cram_hmac_tfm);
2516 connection->cram_hmac_tfm = crypto.cram_hmac_tfm;
2517
2518 mutex_unlock(&connection->resource->conf_update);
2519 mutex_unlock(&connection->data.mutex);
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Unlocked here.
drivers/block/drbd/drbd_main.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index 5b248763a672..a18155cdce41 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -786,7 +786,6 @@ int __drbd_send_protocol(struct drbd_connection *connection, enum drbd_packet cm
if (nc->tentative && connection->agreed_pro_version < 92) {
rcu_read_unlock();
- mutex_unlock(&sock->mutex);
drbd_err(connection, "--dry-run is not supported by peer");
return -EOPNOTSUPP;
}
--
2.20.1
next reply other threads:[~2019-11-07 7:48 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-07 7:48 Dan Carpenter [this message]
2019-11-07 7:48 ` [PATCH] block: drbd: remove a stay unlock in __drbd_send_protocol() Dan Carpenter
2019-11-08 10:46 ` Philipp Reisner
2019-11-08 10:46 ` [Drbd-dev] " Philipp Reisner
2019-11-08 10:46 ` Philipp Reisner
2019-11-08 13:54 ` Jens Axboe
2019-11-08 13:54 ` [Drbd-dev] " Jens Axboe
2019-11-08 13:54 ` Jens Axboe
2019-11-08 16:26 ` Bart Van Assche
2019-11-08 16:26 ` Bart Van Assche
2019-11-08 16:27 ` Jens Axboe
2019-11-08 16:27 ` Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191107074847.GA11695@mwanda \
--to=dan.carpenter@oracle.com \
--cc=axboe@kernel.dk \
--cc=drbd-dev@tron.linbit.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=lars.ellenberg@linbit.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=philipp.reisner@linbit.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.