Skip to contentSkip to conversation

tlshd_handshake_parms: Ensure peeraddr_len == 0 until peeraddr contains a valid address.

PATCH In review Ken Milmore 2 participants 2 messages Jun 8, 2025 Handshake upcall for transport layer security

lore
Share & tools
lore
#0 lore raw

PATCH 2/7 tlshd_handshake_parms: Ensure peeraddr_len == 0 until peeraddr contains a valid address.

---
 src/tlshd/netlink.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
src/tlshd/netlink.c +3 -1
index 34a1f47..ce8e981 100644
@@ -245,9 +245,11 @@ static int tlshd_genl_valid_handler(struct nl_msg *msg, void *arg)
 
 	if (tb[HANDSHAKE_A_ACCEPT_SOCKFD]) {
 		parms->sockfd = nla_get_s32(tb[HANDSHAKE_A_ACCEPT_SOCKFD]);
+		parms->peeraddr_len = sizeof(tlshd_peeraddr);
 		if (getpeername(parms->sockfd, parms->peeraddr,
 				&parms->peeraddr_len) == -1) {
 			tlshd_log_perror("getpeername");
+			parms->peeraddr_len = 0;
 			return NL_STOP;
 		}
 		optlen = sizeof(parms->ip_proto);
@@ -297,7 +299,7 @@ static int tlshd_genl_valid_handler(struct nl_msg *msg, void *arg)
 static const struct tlshd_handshake_parms tlshd_default_handshake_parms = {
 	.peername		= tlshd_peername,
 	.peeraddr		= (struct sockaddr *)&tlshd_peeraddr,
-	.peeraddr_len		= sizeof(tlshd_peeraddr),
+	.peeraddr_len		= 0,
 	.sockfd			= -1,
 	.ip_proto		= -1,
 	.handshake_type		= HANDSHAKE_MSG_TYPE_UNSPEC,
Signature · 1 line
2.47.2
#1 lore raw

On 6/8/25 1:43 PM, Ken Milmore wrote:

Needs a patch description. Why is this change necessary?

Quoted 30 lines
---
 src/tlshd/netlink.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
src/tlshd/netlink.c +3 -1
index 34a1f47..ce8e981 100644
@@ -245,9 +245,11 @@ static int tlshd_genl_valid_handler(struct nl_msg *msg, void *arg)
 
 	if (tb[HANDSHAKE_A_ACCEPT_SOCKFD]) {
 		parms->sockfd = nla_get_s32(tb[HANDSHAKE_A_ACCEPT_SOCKFD]);
+		parms->peeraddr_len = sizeof(tlshd_peeraddr);
 		if (getpeername(parms->sockfd, parms->peeraddr,
 				&parms->peeraddr_len) == -1) {
 			tlshd_log_perror("getpeername");
+			parms->peeraddr_len = 0;
 			return NL_STOP;
 		}
 		optlen = sizeof(parms->ip_proto);
@@ -297,7 +299,7 @@ static int tlshd_genl_valid_handler(struct nl_msg *msg, void *arg)
 static const struct tlshd_handshake_parms tlshd_default_handshake_parms = {
 	.peername		= tlshd_peername,
 	.peeraddr		= (struct sockaddr *)&tlshd_peeraddr,
-	.peeraddr_len		= sizeof(tlshd_peeraddr),
+	.peeraddr_len		= 0,
 	.sockfd			= -1,
 	.ip_proto		= -1,
 	.handshake_type		= HANDSHAKE_MSG_TYPE_UNSPEC,
Signature · 1 line
Chuck Lever