Commit 2651ee5a authored by Jakob Koschel's avatar Jakob Koschel Committed by Jens Axboe

drbd: remove check of list iterator against head past the loop body

When list_for_each_entry() completes the iteration over the whole list
without breaking the loop, the iterator value will be a bogus pointer
computed based on the head element.

While it is safe to use the pointer to determine if it was computed
based on the head element, either with list_entry_is_head() or
&pos->member == head, using the iterator variable after the loop should
be avoided.

In preparation to limit the scope of a list iterator to the list
traversal loop, use a dedicated pointer to point to the found element [1].

Link: https://lore.kernel.org/all/CAHk-=wgRr_D8CB-D9Kg-c=EHreAsk5SqXPwr9Y7k9sA6cWXJ6w@mail.gmail.com/ [1]
Signed-off-by: default avatarJakob Koschel <jakobkoschel@gmail.com>
Reviewed-by: default avatarChristoph Böhmwalder <christoph.boehmwalder@linbit.com>
Link: https://lore.kernel.org/r/20220331220349.885126-2-jakobkoschel@gmail.comSigned-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 901aeda6
...@@ -334,17 +334,21 @@ static void set_if_null_req_next(struct drbd_peer_device *peer_device, struct dr ...@@ -334,17 +334,21 @@ static void set_if_null_req_next(struct drbd_peer_device *peer_device, struct dr
static void advance_conn_req_next(struct drbd_peer_device *peer_device, struct drbd_request *req) static void advance_conn_req_next(struct drbd_peer_device *peer_device, struct drbd_request *req)
{ {
struct drbd_connection *connection = peer_device ? peer_device->connection : NULL; struct drbd_connection *connection = peer_device ? peer_device->connection : NULL;
struct drbd_request *iter = req;
if (!connection) if (!connection)
return; return;
if (connection->req_next != req) if (connection->req_next != req)
return; return;
list_for_each_entry_continue(req, &connection->transfer_log, tl_requests) {
const unsigned s = req->rq_state; req = NULL;
if (s & RQ_NET_QUEUED) list_for_each_entry_continue(iter, &connection->transfer_log, tl_requests) {
const unsigned int s = iter->rq_state;
if (s & RQ_NET_QUEUED) {
req = iter;
break; break;
} }
if (&req->tl_requests == &connection->transfer_log) }
req = NULL;
connection->req_next = req; connection->req_next = req;
} }
...@@ -360,17 +364,21 @@ static void set_if_null_req_ack_pending(struct drbd_peer_device *peer_device, st ...@@ -360,17 +364,21 @@ static void set_if_null_req_ack_pending(struct drbd_peer_device *peer_device, st
static void advance_conn_req_ack_pending(struct drbd_peer_device *peer_device, struct drbd_request *req) static void advance_conn_req_ack_pending(struct drbd_peer_device *peer_device, struct drbd_request *req)
{ {
struct drbd_connection *connection = peer_device ? peer_device->connection : NULL; struct drbd_connection *connection = peer_device ? peer_device->connection : NULL;
struct drbd_request *iter = req;
if (!connection) if (!connection)
return; return;
if (connection->req_ack_pending != req) if (connection->req_ack_pending != req)
return; return;
list_for_each_entry_continue(req, &connection->transfer_log, tl_requests) {
const unsigned s = req->rq_state; req = NULL;
if ((s & RQ_NET_SENT) && (s & RQ_NET_PENDING)) list_for_each_entry_continue(iter, &connection->transfer_log, tl_requests) {
const unsigned int s = iter->rq_state;
if ((s & RQ_NET_SENT) && (s & RQ_NET_PENDING)) {
req = iter;
break; break;
} }
if (&req->tl_requests == &connection->transfer_log) }
req = NULL;
connection->req_ack_pending = req; connection->req_ack_pending = req;
} }
...@@ -386,17 +394,21 @@ static void set_if_null_req_not_net_done(struct drbd_peer_device *peer_device, s ...@@ -386,17 +394,21 @@ static void set_if_null_req_not_net_done(struct drbd_peer_device *peer_device, s
static void advance_conn_req_not_net_done(struct drbd_peer_device *peer_device, struct drbd_request *req) static void advance_conn_req_not_net_done(struct drbd_peer_device *peer_device, struct drbd_request *req)
{ {
struct drbd_connection *connection = peer_device ? peer_device->connection : NULL; struct drbd_connection *connection = peer_device ? peer_device->connection : NULL;
struct drbd_request *iter = req;
if (!connection) if (!connection)
return; return;
if (connection->req_not_net_done != req) if (connection->req_not_net_done != req)
return; return;
list_for_each_entry_continue(req, &connection->transfer_log, tl_requests) {
const unsigned s = req->rq_state; req = NULL;
if ((s & RQ_NET_SENT) && !(s & RQ_NET_DONE)) list_for_each_entry_continue(iter, &connection->transfer_log, tl_requests) {
const unsigned int s = iter->rq_state;
if ((s & RQ_NET_SENT) && !(s & RQ_NET_DONE)) {
req = iter;
break; break;
} }
if (&req->tl_requests == &connection->transfer_log) }
req = NULL;
connection->req_not_net_done = req; connection->req_not_net_done = req;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment