From: Jordan Rife <jrife@google.com>
To: stable@vger.kernel.org
Cc: ccaulfie@redhat.com, teigland@redhat.com, sashal@kernel.org,
cluster-devel@redhat.com, valentin@vrvis.at,
aahringo@redhat.com, carnil@debian.org,
Jordan Rife <jrife@google.com>
Subject: [PATCH 6.1.y] dlm: Treat dlm_local_addr[0] as sockaddr_storage *
Date: Fri, 9 Feb 2024 10:26:57 -0600 [thread overview]
Message-ID: <20240209162658.70763-2-jrife@google.com> (raw)
Backport e11dea8 ("dlm: use kernel_connect() and kernel_bind()") to
Linux stable 6.1 caused a regression. The original patch expected
dlm_local_addrs[0] to be of type sockaddr_storage, because c51c9cd ("fs:
dlm: don't put dlm_local_addrs on heap") changed its type from
sockaddr_storage* to sockaddr_storage in Linux 6.5+ while in older Linux
versions this is still the original sockaddr_storage*.
Link: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1063338
Cc: <stable@vger.kernel.org> # 6.1.x
Fixes: e11dea8f5033 ("dlm: use kernel_connect() and kernel_bind()")
Signed-off-by: Jordan Rife <jrife@google.com>
---
fs/dlm/lowcomms.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c
index 72f34f96d0155..8426073e73cf2 100644
--- a/fs/dlm/lowcomms.c
+++ b/fs/dlm/lowcomms.c
@@ -1900,7 +1900,7 @@ static int dlm_tcp_listen_bind(struct socket *sock)
/* Bind to our port */
make_sockaddr(dlm_local_addr[0], dlm_config.ci_tcp_port, &addr_len);
- return kernel_bind(sock, (struct sockaddr *)&dlm_local_addr[0],
+ return kernel_bind(sock, (struct sockaddr *)dlm_local_addr[0],
addr_len);
}
--
2.43.0.687.g38aa6559b0-goog
next reply other threads:[~2024-02-09 16:27 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-09 16:26 Jordan Rife [this message]
2024-02-09 18:51 ` [PATCH 6.1.y] dlm: Treat dlm_local_addr[0] as sockaddr_storage * Sasha Levin
2024-02-09 19:08 ` Jordan Rife
2024-02-11 16:29 ` Sasha Levin
2024-02-11 17:30 ` Jordan Rife
2024-02-13 12:20 ` Sasha Levin
2024-02-13 17:14 ` Jordan Rife
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=20240209162658.70763-2-jrife@google.com \
--to=jrife@google.com \
--cc=aahringo@redhat.com \
--cc=carnil@debian.org \
--cc=ccaulfie@redhat.com \
--cc=cluster-devel@redhat.com \
--cc=sashal@kernel.org \
--cc=stable@vger.kernel.org \
--cc=teigland@redhat.com \
--cc=valentin@vrvis.at \
/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 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).