net: core: Convert inet_addr_is_any() to sockaddr_storage

All the callers of inet_addr_is_any() have a sockaddr_storage-backed
sockaddr. Avoid casts and switch prototype to the actual object being
used.

Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com> # SCSI
Signed-off-by: Kees Cook <kees@kernel.org>
Link: https://patch.msgid.link/20250521204619.2301870-1-kees@kernel.org
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/nvme/target/rdma.c b/drivers/nvme/target/rdma.c
index 2a4536ef618487455ada997d0285d9dce657c2ef..79a5aad2e9d026480ab81a132d141528b9a162f7 100644 (file)
--- a/drivers/nvme/target/rdma.c
+++ b/drivers/nvme/target/rdma.c
@@ -1999,7 +1999,7 @@ static void nvmet_rdma_disc_port_addr(struct nvmet_req *req,
        struct nvmet_rdma_port *port = nport->priv;
        struct rdma_cm_id *cm_id = port->cm_id;
 
-       if (inet_addr_is_any((struct sockaddr *)&cm_id->route.addr.src_addr)) {
+       if (inet_addr_is_any(&cm_id->route.addr.src_addr)) {
                struct nvmet_rdma_rsp *rsp =
                        container_of(req, struct nvmet_rdma_rsp, req);
                struct rdma_cm_id *req_cm_id = rsp->queue->cm_id;

diff --git a/drivers/nvme/target/tcp.c b/drivers/nvme/target/tcp.c
index 12a5cb8641ca307ff4f2e88b686a68cc7e0f7a17..5cd1cf74f8ff9f5f1e2f47a40b5bb78a72f78d32 100644 (file)
--- a/drivers/nvme/target/tcp.c
+++ b/drivers/nvme/target/tcp.c
@@ -2194,7 +2194,7 @@ static void nvmet_tcp_disc_port_addr(struct nvmet_req *req,
 {
        struct nvmet_tcp_port *port = nport->priv;
 
-       if (inet_addr_is_any((struct sockaddr *)&port->addr)) {
+       if (inet_addr_is_any(&port->addr)) {
                struct nvmet_tcp_cmd *cmd =
                        container_of(req, struct nvmet_tcp_cmd, req);
                struct nvmet_tcp_queue *queue = cmd->queue;

diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
index 620ba6e0ab075686024315e9c5d5ea43e1f6269d..a2dde08c8a62ef28a712db989712b8ecb3ff1e28 100644 (file)
--- a/drivers/target/iscsi/iscsi_target.c
+++ b/drivers/target/iscsi/iscsi_target.c
@@ -3419,7 +3419,7 @@ iscsit_build_sendtargets_response(struct iscsit_cmd *cmd,
                                        }
                                }
 
-                               if (inet_addr_is_any((struct sockaddr *)&np->np_sockaddr))
+                               if (inet_addr_is_any(&np->np_sockaddr))
                                        sockaddr = &conn->local_sockaddr;
                                else
                                        sockaddr = &np->np_sockaddr;

diff --git a/include/linux/inet.h b/include/linux/inet.h
index bd8276e96e6085b7b7a16f9cb6a918e702979cbd..9158772f355972d8c112962c39c6749796251ae1 100644 (file)
--- a/include/linux/inet.h
+++ b/include/linux/inet.h
@@ -55,6 +55,6 @@ extern int in6_pton(const char *src, int srclen, u8 *dst, int delim, const char
 
 extern int inet_pton_with_scope(struct net *net, unsigned short af,
                const char *src, const char *port, struct sockaddr_storage *addr);
-extern bool inet_addr_is_any(struct sockaddr *addr);
+bool inet_addr_is_any(struct sockaddr_storage *addr);
 
 #endif /* _LINUX_INET_H */

diff --git a/net/core/utils.c b/net/core/utils.c
index 27f4cffaae05d9fa1f4c479a2bd891a54396a540..e47feeaa5a4916f1bedc6cf187172f1b4245023a 100644 (file)
--- a/net/core/utils.c
+++ b/net/core/utils.c
@@ -399,9 +399,9 @@ int inet_pton_with_scope(struct net *net, __kernel_sa_family_t af,
 }
 EXPORT_SYMBOL(inet_pton_with_scope);
 
-bool inet_addr_is_any(struct sockaddr *addr)
+bool inet_addr_is_any(struct sockaddr_storage *addr)
 {
-       if (addr->sa_family == AF_INET6) {
+       if (addr->ss_family == AF_INET6) {
                struct sockaddr_in6 *in6 = (struct sockaddr_in6 *)addr;
                const struct sockaddr_in6 in6_any =
                        { .sin6_addr = IN6ADDR_ANY_INIT };
@@ -409,13 +409,13 @@ bool inet_addr_is_any(struct sockaddr *addr)
                if (!memcmp(in6->sin6_addr.s6_addr,
                            in6_any.sin6_addr.s6_addr, 16))
                        return true;
-       } else if (addr->sa_family == AF_INET) {
+       } else if (addr->ss_family == AF_INET) {
                struct sockaddr_in *in = (struct sockaddr_in *)addr;
 
                if (in->sin_addr.s_addr == htonl(INADDR_ANY))
                        return true;
        } else {
-               pr_warn("unexpected address family %u\n", addr->sa_family);
+               pr_warn("unexpected address family %u\n", addr->ss_family);
        }
 
        return false;