From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2389EC54EDA for ; Thu, 22 May 2025 16:38:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=l0vyZcnIVM4bigsYp1QT22GmXPXKNYV2m52Fpjg/7Ug=; b=jXobCCUaNriFVWuT4SCa5Y9Y0e /PhIeL+qOMH1kzWnQKwPhkx4IG9IZ+m6JhQfD8MXGeHuyGeRX2C/pRmghL4rt/5RENDEvhsbsAEf4 Y0VgxC0WASvdDqzwsmC6hdemsw3Zefl+ikKPgJySHPUEYfH6Na7CDVu3rk6RttjugQV3xF1BTXQcK q60HNuCGlzXdueFRu2Qler14nJHdeGOSeIMnsEE/D/s0xfJwh1aW+0QZUrBtDavgi7+xRY1ewZqhK leen8aETS8R3P95GLNpWZBIkOey+j9MI7mO8bQ9+UXXJY6bFqYHpgQD3PDzb9QM4NQHH1TJ1SgADl clRFD9+w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1uI8w0-00000001c0Z-1sF6; Thu, 22 May 2025 16:38:20 +0000 Received: from tor.source.kernel.org ([172.105.4.254]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1uHqKX-0000000Go0U-0xNL for linux-nvme@lists.infradead.org; Wed, 21 May 2025 20:46:25 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 8030B629EA; Wed, 21 May 2025 20:46:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1E3F4C4CEEA; Wed, 21 May 2025 20:46:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1747860383; bh=7pe1LymnDZobdD7qun4IKIsviYRqGOfHnpizj/tlnt0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZGVc1TK3io4U7jjCY/cosXBTPG8s+eQeHf0GkXqwU/I9n2sI0LOD03/14eEXve1MW fknUwTws0UBX6LdmLys8KsJOPe6igrD6h/NkXYFBu6A23zefiysvgVTcJr768A/gxI DlcW15GDKVRT85bQ5X/FQxKtXdvjQ9RJ4Li1xyEqhvT1/SI8Dy8qzL7I5CU5fETEId sgzzalTX0C+Pb78oQuGpyzw6Cc5r1cKTXuUnJlagqcQK6OVt8tXm/TqinnUilvlvXt 3qb4/g8qaX1oUvJ3j/nUi8lEjdHgZeQQV1DVzVOH08eV2zGBOvMyM8eLCyuSw0k5zR YALnYtvlwDz7w== From: Kees Cook To: Kuniyuki Iwashima Cc: Kees Cook , "Martin K . Petersen" , Christoph Hellwig , Sagi Grimberg , Chaitanya Kulkarni , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Mike Christie , Max Gurtovoy , Maurizio Lombardi , Dmitry Bogdanov , Mingzhe Zou , Christophe Leroy , Simon Horman , "Dr. David Alan Gilbert" , linux-nvme@lists.infradead.org, linux-scsi@vger.kernel.org, target-devel@vger.kernel.org, netdev@vger.kernel.org, Willem de Bruijn , "Gustavo A. R. Silva" , Andrew Lunn , Stanislav Fomichev , Cosmin Ratiu , Lei Yang , Ido Schimmel , Samuel Mendoza-Jonas , Paul Fertser , Alexander Aring , Stefan Schmidt , Miquel Raynal , Hayes Wang , Douglas Anderson , Grant Grundler , Jay Vosburgh , "K. Y. Srinivasan" , Haiyang Zhang , Wei Liu , Dexuan Cui , Jiri Pirko , Jason Wang , Vladimir Oltean , Florian Fainelli , Kory Maincent , Maxim Georgiev , Aleksander Jan Bajkowski , Philipp Hahn , Eric Biggers , Ard Biesheuvel , Al Viro , Ahmed Zaki , Alexander Lobakin , Xiao Liang , linux-kernel@vger.kernel.org, linux-wpan@vger.kernel.org, linux-usb@vger.kernel.org, linux-hyperv@vger.kernel.org, linux-hardening@vger.kernel.org Subject: [PATCH net-next v2 1/8] net: core: Convert inet_addr_is_any() to sockaddr_storage Date: Wed, 21 May 2025 13:46:09 -0700 Message-Id: <20250521204619.2301870-1-kees@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250521204310.it.500-kees@kernel.org> References: <20250521204310.it.500-kees@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=4810; i=kees@kernel.org; h=from:subject; bh=7pe1LymnDZobdD7qun4IKIsviYRqGOfHnpizj/tlnt0=; b=owGbwMvMwCVmps19z/KJym7G02pJDBl61lNd5Na5Jr9wqfrJms612bn9O9/FuOMsDbxi144oT Xc+Kvu9o5SFQYyLQVZMkSXIzj3OxeNte7j7XEWYOaxMIEMYuDgFYCLnlzD8j2bZUf579suLt75l JaVPmKu16WgT070pvy7MP3ynT3MRKx8jw53enUzBvgl1H/nSd4ue9v4mOlP34PRLv0/yvhYX6rz Uzw0A X-Developer-Key: i=kees@kernel.org; a=openpgp; fpr=A5C3F68F229DD60F723E6E138972F4DFDC6DC026 Content-Transfer-Encoding: 8bit X-Mailman-Approved-At: Thu, 22 May 2025 09:38:03 -0700 X-BeenThere: linux-nvme@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-nvme" Errors-To: linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org 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 Reviewed-by: Martin K. Petersen # SCSI Signed-off-by: Kees Cook --- Cc: Christoph Hellwig Cc: Sagi Grimberg Cc: Chaitanya Kulkarni Cc: "Martin K. Petersen" Cc: "David S. Miller" Cc: Eric Dumazet Cc: Jakub Kicinski Cc: Paolo Abeni Cc: Mike Christie Cc: Max Gurtovoy Cc: Maurizio Lombardi Cc: Dmitry Bogdanov Cc: Mingzhe Zou Cc: Christophe Leroy Cc: Simon Horman Cc: "Dr. David Alan Gilbert" Cc: linux-nvme@lists.infradead.org Cc: linux-scsi@vger.kernel.org Cc: target-devel@vger.kernel.org Cc: netdev@vger.kernel.org --- include/linux/inet.h | 2 +- drivers/nvme/target/rdma.c | 2 +- drivers/nvme/target/tcp.c | 2 +- drivers/target/iscsi/iscsi_target.c | 2 +- net/core/utils.c | 8 ++++---- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/linux/inet.h b/include/linux/inet.h index bd8276e96e60..9158772f3559 100644 --- 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/drivers/nvme/target/rdma.c b/drivers/nvme/target/rdma.c index 2a4536ef6184..79a5aad2e9d0 100644 --- 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 12a5cb8641ca..5cd1cf74f8ff 100644 --- 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 620ba6e0ab07..a2dde08c8a62 100644 --- 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/net/core/utils.c b/net/core/utils.c index 27f4cffaae05..e47feeaa5a49 100644 --- 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; -- 2.34.1