From patchwork Wed Mar 15 15:42:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 13176199 X-Patchwork-Delegate: kuba@kernel.org 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 398FEC61DA4 for ; Wed, 15 Mar 2023 15:42:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232173AbjCOPmv (ORCPT ); Wed, 15 Mar 2023 11:42:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57904 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230283AbjCOPmu (ORCPT ); Wed, 15 Mar 2023 11:42:50 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0E96726C21 for ; Wed, 15 Mar 2023 08:42:49 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id e11-20020a5b004b000000b00b37118ce5a7so13505225ybp.10 for ; Wed, 15 Mar 2023 08:42:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1678894968; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=PxZspUsZHEKgId/MU08X6ylQHhkBRvljN7OjCrVujWw=; b=gN7HV6A3tr0Iukd4Y3JgDxghu2MytqK1g+8CYppNmpdbEGqMFq4CnFleaG+3znkm40 sTRWuKtFrk+zCN6ix+Vo0yV+WpeWfUwm/vQ+lK12L9jML7lmKhHJ05oBHLVUWBnEqO75 s7vFC6kCgSLBJPAnFCq7HZ7R/eauLsN71ip824khSXdCcUfpOer2L1AWt+wWtz3foVdh LWrSy1pYjLzQ/phqojstF/jrWUnZR8uKED7lX4NJVAVH+mIbVFShSwdwgTdLeWyRlFWL EYn+3TtpoclPYFc8jdLSARVJSAF/MNfOVY4kjPgt2drsLr3Ezs2k1yV8nKvvXR6V3J2V 7rKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678894968; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=PxZspUsZHEKgId/MU08X6ylQHhkBRvljN7OjCrVujWw=; b=LoUrUyXUPJxsnpdIRX1nKU4QdZ8bJSABeRCUvd2LLbhauobs4/L+rOjLl26/ysNJ2L WNZq/SXh0tbbwrHfrPP6hHylyD0vku3Fp0Gn5X4TwXhFtBZqju+ixXnYRRwwyf3/OjcH p4YwQOhkE0r87cQHkbehc3QWDmKdj/kCHvc69A0hGcoZQjvOiajcJ5Et39DbPpposKc9 IcGVZqcS2yy+Quez6DCdajD/A5+8s8yzY7xSLeqoAR3PVgL4LXFpW8MozNoY53gI6dvr rqz1pZdDIigg5qelEK3djoEfsPlF8CfaqHQo5BFe1MgD4W4+XB0k+kDawsdhHdsxzSDR QZyg== X-Gm-Message-State: AO0yUKXioKHzBvlxr6ouSi/nO7e/A3OMRlf/i7+g9rOdIsKwGgTRmgf5 3WWrKmTeB1jOCgoIWfqk0JOB6EK7tPjLuA== X-Google-Smtp-Source: AK7set9/nVvksWjsGu2IUau1RruneK5qvmbXTLoZV2J9bnupHbG+FME/dilh9vlu7DzCmfFtVXlLN3XXCOrcBQ== X-Received: from edumazet1.c.googlers.com ([fda3:e722:ac3:cc00:2b:7d90:c0a8:395a]) (user=edumazet job=sendgmr) by 2002:a5b:c51:0:b0:91d:98cd:bfe4 with SMTP id d17-20020a5b0c51000000b0091d98cdbfe4mr26634658ybr.10.1678894968372; Wed, 15 Mar 2023 08:42:48 -0700 (PDT) Date: Wed, 15 Mar 2023 15:42:38 +0000 In-Reply-To: <20230315154245.3405750-1-edumazet@google.com> Mime-Version: 1.0 References: <20230315154245.3405750-1-edumazet@google.com> X-Mailer: git-send-email 2.40.0.rc1.284.g88254d51c5-goog Message-ID: <20230315154245.3405750-2-edumazet@google.com> Subject: [PATCH net-next 1/8] inet: preserve const qualifier in inet_sk() From: Eric Dumazet To: "David S . Miller" , Jakub Kicinski , Paolo Abeni Cc: David Ahern , netdev@vger.kernel.org, eric.dumazet@gmail.com, Eric Dumazet Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org We can change inet_sk() to propagate const qualifier of its argument. This should avoid some potential errors caused by accidental (const -> not_const) promotion. Signed-off-by: Eric Dumazet Reviewed-by: Simon Horman --- include/net/inet_sock.h | 9 +++++---- include/trace/events/sock.h | 4 ++-- include/trace/events/tcp.h | 2 +- net/ipv4/ip_output.c | 5 +++-- net/ipv6/ping.c | 2 +- net/ipv6/udp.c | 2 +- net/mptcp/sockopt.c | 2 +- security/lsm_audit.c | 4 ++-- 8 files changed, 16 insertions(+), 14 deletions(-) diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h index 51857117ac0995cee20c1e62752c470d2a473fa8..6eb8235be67f8b8265cd86782aed2b489e8850ee 100644 --- a/include/net/inet_sock.h +++ b/include/net/inet_sock.h @@ -305,10 +305,11 @@ static inline struct sock *skb_to_full_sk(const struct sk_buff *skb) return sk_to_full_sk(skb->sk); } -static inline struct inet_sock *inet_sk(const struct sock *sk) -{ - return (struct inet_sock *)sk; -} +#define inet_sk(sk) \ + _Generic(sk, \ + const struct sock * : ((const struct inet_sock *)(sk)), \ + struct sock * : ((struct inet_sock *)(sk)) \ + ) static inline void __inet_sk_copy_descendant(struct sock *sk_to, const struct sock *sk_from, diff --git a/include/trace/events/sock.h b/include/trace/events/sock.h index 03d19fc562f872d68cfb2349797f0924cfba718b..fd206a6ab5b85a8eb50fc9303abc28d74c50ea07 100644 --- a/include/trace/events/sock.h +++ b/include/trace/events/sock.h @@ -158,7 +158,7 @@ TRACE_EVENT(inet_sock_set_state, ), TP_fast_assign( - struct inet_sock *inet = inet_sk(sk); + const struct inet_sock *inet = inet_sk(sk); struct in6_addr *pin6; __be32 *p32; @@ -222,7 +222,7 @@ TRACE_EVENT(inet_sk_error_report, ), TP_fast_assign( - struct inet_sock *inet = inet_sk(sk); + const struct inet_sock *inet = inet_sk(sk); struct in6_addr *pin6; __be32 *p32; diff --git a/include/trace/events/tcp.h b/include/trace/events/tcp.h index 901b440238d5fc203b78cff1081b4b7e1e2eb4bd..bf06db8d2046c4a7f59070b724ce6fc7762f9d4b 100644 --- a/include/trace/events/tcp.h +++ b/include/trace/events/tcp.h @@ -67,7 +67,7 @@ DECLARE_EVENT_CLASS(tcp_event_sk_skb, ), TP_fast_assign( - struct inet_sock *inet = inet_sk(sk); + const struct inet_sock *inet = inet_sk(sk); __be32 *p32; __entry->skbaddr = skb; diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index e7bef36ce26f5b5e5503eaf14319b2465b779598..cb04dbad9ea474fcaa4b5ba31c4a37299c4e1a8d 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@ -129,7 +129,8 @@ int ip_local_out(struct net *net, struct sock *sk, struct sk_buff *skb) } EXPORT_SYMBOL_GPL(ip_local_out); -static inline int ip_select_ttl(struct inet_sock *inet, struct dst_entry *dst) +static inline int ip_select_ttl(const struct inet_sock *inet, + const struct dst_entry *dst) { int ttl = inet->uc_ttl; @@ -146,7 +147,7 @@ int ip_build_and_send_pkt(struct sk_buff *skb, const struct sock *sk, __be32 saddr, __be32 daddr, struct ip_options_rcu *opt, u8 tos) { - struct inet_sock *inet = inet_sk(sk); + const struct inet_sock *inet = inet_sk(sk); struct rtable *rt = skb_rtable(skb); struct net *net = sock_net(sk); struct iphdr *iph; diff --git a/net/ipv6/ping.c b/net/ipv6/ping.c index 808983bc2ec9f92be7d13237fb7d52b6423ccf23..c4835dbdfcff7912465713cdac9914b0f5585972 100644 --- a/net/ipv6/ping.c +++ b/net/ipv6/ping.c @@ -237,7 +237,7 @@ static int ping_v6_seq_show(struct seq_file *seq, void *v) seq_puts(seq, IPV6_SEQ_DGRAM_HEADER); } else { int bucket = ((struct ping_iter_state *) seq->private)->bucket; - struct inet_sock *inet = inet_sk(v); + struct inet_sock *inet = inet_sk((struct sock *)v); __u16 srcp = ntohs(inet->inet_sport); __u16 destp = ntohs(inet->inet_dport); ip6_dgram_sock_seq_show(seq, v, srcp, destp, bucket); diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index 9fb2f33ee3a76a09bbe15a9aaf1371a804f91ee2..ab4ae886235ac9557219c901c5041adfa8b026ef 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -1708,7 +1708,7 @@ int udp6_seq_show(struct seq_file *seq, void *v) seq_puts(seq, IPV6_SEQ_DGRAM_HEADER); } else { int bucket = ((struct udp_iter_state *)seq->private)->bucket; - struct inet_sock *inet = inet_sk(v); + const struct inet_sock *inet = inet_sk((const struct sock *)v); __u16 srcp = ntohs(inet->inet_sport); __u16 destp = ntohs(inet->inet_dport); __ip6_dgram_sock_seq_show(seq, v, srcp, destp, diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c index 8a9656248b0f09e78ebf3d6d787449f33505b81f..5cef4d3d21ac824ab6d3a5ee8be3bd00cce63925 100644 --- a/net/mptcp/sockopt.c +++ b/net/mptcp/sockopt.c @@ -1046,7 +1046,7 @@ static int mptcp_getsockopt_tcpinfo(struct mptcp_sock *msk, char __user *optval, static void mptcp_get_sub_addrs(const struct sock *sk, struct mptcp_subflow_addrs *a) { - struct inet_sock *inet = inet_sk(sk); + const struct inet_sock *inet = inet_sk(sk); memset(a, 0, sizeof(*a)); diff --git a/security/lsm_audit.c b/security/lsm_audit.c index a7355b4b9bb86d173f94e43109148bc0ea27d1b3..00d3bdd386e294ecd562bfa8ce502bf179ad32d9 100644 --- a/security/lsm_audit.c +++ b/security/lsm_audit.c @@ -317,7 +317,7 @@ static void dump_common_audit_data(struct audit_buffer *ab, switch (sk->sk_family) { case AF_INET: { - struct inet_sock *inet = inet_sk(sk); + const struct inet_sock *inet = inet_sk(sk); print_ipv4_addr(ab, inet->inet_rcv_saddr, inet->inet_sport, @@ -329,7 +329,7 @@ static void dump_common_audit_data(struct audit_buffer *ab, } #if IS_ENABLED(CONFIG_IPV6) case AF_INET6: { - struct inet_sock *inet = inet_sk(sk); + const struct inet_sock *inet = inet_sk(sk); print_ipv6_addr(ab, &sk->sk_v6_rcv_saddr, inet->inet_sport, From patchwork Wed Mar 15 15:42:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 13176200 X-Patchwork-Delegate: kuba@kernel.org 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4B641C6FD1D for ; Wed, 15 Mar 2023 15:42:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232233AbjCOPmx (ORCPT ); Wed, 15 Mar 2023 11:42:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57964 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232276AbjCOPmw (ORCPT ); Wed, 15 Mar 2023 11:42:52 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A991B26C21 for ; Wed, 15 Mar 2023 08:42:50 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id z4-20020a25bb04000000b00b392ae70300so12617748ybg.21 for ; Wed, 15 Mar 2023 08:42:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1678894970; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=/xDdz+0f0G/ivmTmawwc9Slr7Ia7Vq27bOWw6FDM1hA=; b=q8EKH66utjDZzWeHa1rH174y5dJb6TXeM+YldCQ46m/i9V20pXeSNpsqFS7GP9f33C PTBMCDAFoPAYs8gwcircFjXk3GJN/1+KlvMkdUICjKu/0x8faDbtSBUwmdq+H8Xfrd8+ 9uJpT/H/hoAPAqn/YZRCoK5RK6UAu9UEfX3Y5zL0DkilT84Vg81Kx3nMsFec3yudHUOz utiKQgHNrFYjcAJ/8frnXrFxilgJkJ8bidmnd03ow0yTrWS4HYGCosaw0DXoaVajh9O3 rro6M8uEnXEWwRRAItWr0AtNM1ZCYI2f7vgSgDZFiAk1viJB4ZJJcmewg9rUPAqYFIoc +dyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678894970; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=/xDdz+0f0G/ivmTmawwc9Slr7Ia7Vq27bOWw6FDM1hA=; b=ZSEOJOSA7bIz/mGNOFm/hdEdBKhbgGDPJCRNX8xZCmJqqtiVl9vPx+CWLnhrg0uF/D GkeeHWQtmwZxYwoRuM3419V6izXnkE/nDQbKKuEObYpfANdMkzUgNpCIRf9ROwejOYZ9 NqRkXtpEEgFrvvEIxalNjJmlfj73cMExTE8gHiVhhiCw+fN3Q+MW7bqjWtH8RxQB2MNB EjKpKSBTc1GfYgk9hiDJBhrdfxYQZPoDcYTWeL9hmVEVwgDZUZgon0XtxCV6ZPMycYBw L+3PAxwg7CmpDrAnkKDlbzrQgZcSqDnzjg49vhJrJNH6eBhohweULj+0a7IPidwxs/ob fqdg== X-Gm-Message-State: AO0yUKWa7T5G0qthD/xY1KXxdjJm01YH9enOvNkJy6wRk0MO5a1UmrZC xwxQnOxHpGPYtxlNb+khH9rZMt0XHRbYNA== X-Google-Smtp-Source: AK7set/h9yBVEHOz+fq7oy9Hvsr329fhqaqFav/RFUkgDcRVJWuencg19GaWyjmVy2SE1fiiuxhvvJqwu7SlJA== X-Received: from edumazet1.c.googlers.com ([fda3:e722:ac3:cc00:2b:7d90:c0a8:395a]) (user=edumazet job=sendgmr) by 2002:a5b:bc7:0:b0:b3b:6452:6a0d with SMTP id c7-20020a5b0bc7000000b00b3b64526a0dmr6594259ybr.1.1678894969989; Wed, 15 Mar 2023 08:42:49 -0700 (PDT) Date: Wed, 15 Mar 2023 15:42:39 +0000 In-Reply-To: <20230315154245.3405750-1-edumazet@google.com> Mime-Version: 1.0 References: <20230315154245.3405750-1-edumazet@google.com> X-Mailer: git-send-email 2.40.0.rc1.284.g88254d51c5-goog Message-ID: <20230315154245.3405750-3-edumazet@google.com> Subject: [PATCH net-next 2/8] ipv4: constify ip_mc_sf_allow() socket argument From: Eric Dumazet To: "David S . Miller" , Jakub Kicinski , Paolo Abeni Cc: David Ahern , netdev@vger.kernel.org, eric.dumazet@gmail.com, Eric Dumazet Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org This clarifies ip_mc_sf_allow() intent. Signed-off-by: Eric Dumazet Reviewed-by: Simon Horman --- include/linux/igmp.h | 2 +- net/ipv4/igmp.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/linux/igmp.h b/include/linux/igmp.h index b19d3284551f083d0eec3353cd8ec1f486ae4b42..ebf4349a53af7888104e8c5fe0d7af0e5604ae69 100644 --- a/include/linux/igmp.h +++ b/include/linux/igmp.h @@ -122,7 +122,7 @@ extern int ip_mc_msfget(struct sock *sk, struct ip_msfilter *msf, sockptr_t optval, sockptr_t optlen); extern int ip_mc_gsfget(struct sock *sk, struct group_filter *gsf, sockptr_t optval, size_t offset); -extern int ip_mc_sf_allow(struct sock *sk, __be32 local, __be32 rmt, +extern int ip_mc_sf_allow(const struct sock *sk, __be32 local, __be32 rmt, int dif, int sdif); extern void ip_mc_init_dev(struct in_device *); extern void ip_mc_destroy_dev(struct in_device *); diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c index c920aa9a62a988bf91a5420e59eb5878c271bf9a..48ff5f13e7979dc00da60b466ee2e74ddce0891b 100644 --- a/net/ipv4/igmp.c +++ b/net/ipv4/igmp.c @@ -2638,10 +2638,10 @@ int ip_mc_gsfget(struct sock *sk, struct group_filter *gsf, /* * check if a multicast source filter allows delivery for a given */ -int ip_mc_sf_allow(struct sock *sk, __be32 loc_addr, __be32 rmt_addr, +int ip_mc_sf_allow(const struct sock *sk, __be32 loc_addr, __be32 rmt_addr, int dif, int sdif) { - struct inet_sock *inet = inet_sk(sk); + const struct inet_sock *inet = inet_sk(sk); struct ip_mc_socklist *pmc; struct ip_sf_socklist *psl; int i; From patchwork Wed Mar 15 15:42:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 13176201 X-Patchwork-Delegate: kuba@kernel.org 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2CF31C7618B for ; Wed, 15 Mar 2023 15:43:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231976AbjCOPm6 (ORCPT ); Wed, 15 Mar 2023 11:42:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58042 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232103AbjCOPmy (ORCPT ); Wed, 15 Mar 2023 11:42:54 -0400 Received: from mail-qk1-x749.google.com (mail-qk1-x749.google.com [IPv6:2607:f8b0:4864:20::749]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 917CA74DD9 for ; Wed, 15 Mar 2023 08:42:52 -0700 (PDT) Received: by mail-qk1-x749.google.com with SMTP id x18-20020a05620a099200b00745c25b2fa3so4472731qkx.16 for ; Wed, 15 Mar 2023 08:42:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1678894971; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=GGC1UKmb4hFSN3YGErEh1pF+1YaH6lPTo/aDscXVbkY=; b=RW+ff/FbGCuaF+KEeHotSSrnkZbCv1RroLNFYxjAQ0etAt4p4+6i81lU4gYnLNy+3d BdZVwotTTErzj2bHw6kxoWKpInuGkwTNrkmXevsjgJ1Ag7FnlAVZ/Twk93S4U+/xCViP EYZBf1w9QDcqEsk+iqf3MMXum6Qu5PmlOyWZlTcl9RL5mChlHq7t5rxRrznT7QeRFvW5 kVxk2/T2AyKFjxFhKGTDi7ZxCTvScgfubxNN3pQwoxbg7LcCid44jFw1+tsIDx2hf4P8 9JaSVIO+ZHLfrROPFfOfIZJ0vthapru3DNSZWdvpUwf4NFejl+sm7xeVFlT+CLjulEQW 9KuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678894971; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=GGC1UKmb4hFSN3YGErEh1pF+1YaH6lPTo/aDscXVbkY=; b=oljdxrXgZhs2eczdivQWabAlE6NYm8HP4leuRqYzuPQtw5DkImDRcUoXd2gzdwOmn/ BUpSPndDT8C+AggPXmYIIa5uqL7Cu9nYelfmi9kOtbn2Kt81bLlG9oiaro1mf7mn5Mxq ZZyhjvHac3f4e8sxrBMV7nzxbCQhlJYNh4qL8hnNHe1q1YCWWDfaGiPVe5OBjJdwQAiD GgoPNoIPtjilgKKgcrV8b1f6QirkvULng7bQEm5ZB83MBX3TUoM0Wl3I+s1hy7NUFGrJ tm7LMT6/7jPgYmGnTOrFRGhvLvsxsWN03kO04FdaDL61+ouvyqSSUW4MXQTwgfSSmPos EDvw== X-Gm-Message-State: AO0yUKULRHbSnTzO9nkadR5Y3XCI63syBBuiiH0/AwEjhuMW4yiTji4c zsrzkbl7Zh2u939ymh03pTfMdNx/COLlqg== X-Google-Smtp-Source: AK7set8z5dgYBhpnqyX+7KacBCUOat37NYdYzryMQJet333NTZogAW5yjuwVHwvmG8odkS3DHhpZ+sgEO5VFLA== X-Received: from edumazet1.c.googlers.com ([fda3:e722:ac3:cc00:2b:7d90:c0a8:395a]) (user=edumazet job=sendgmr) by 2002:a05:620a:30c:b0:73b:aa08:79ea with SMTP id s12-20020a05620a030c00b0073baa0879eamr4454833qkm.5.1678894971680; Wed, 15 Mar 2023 08:42:51 -0700 (PDT) Date: Wed, 15 Mar 2023 15:42:40 +0000 In-Reply-To: <20230315154245.3405750-1-edumazet@google.com> Mime-Version: 1.0 References: <20230315154245.3405750-1-edumazet@google.com> X-Mailer: git-send-email 2.40.0.rc1.284.g88254d51c5-goog Message-ID: <20230315154245.3405750-4-edumazet@google.com> Subject: [PATCH net-next 3/8] udp: constify __udp_is_mcast_sock() socket argument From: Eric Dumazet To: "David S . Miller" , Jakub Kicinski , Paolo Abeni Cc: David Ahern , netdev@vger.kernel.org, eric.dumazet@gmail.com, Eric Dumazet Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org This clarifies __udp_is_mcast_sock() intent. Signed-off-by: Eric Dumazet Reviewed-by: Simon Horman --- net/ipv4/udp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index dc8feb54d835f0824aa6833e36db34f686c456ec..aa32afd871ee50968f7bb8152401be60dece1454 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -578,12 +578,12 @@ struct sock *udp4_lib_lookup(struct net *net, __be32 saddr, __be16 sport, EXPORT_SYMBOL_GPL(udp4_lib_lookup); #endif -static inline bool __udp_is_mcast_sock(struct net *net, struct sock *sk, +static inline bool __udp_is_mcast_sock(struct net *net, const struct sock *sk, __be16 loc_port, __be32 loc_addr, __be16 rmt_port, __be32 rmt_addr, int dif, int sdif, unsigned short hnum) { - struct inet_sock *inet = inet_sk(sk); + const struct inet_sock *inet = inet_sk(sk); if (!net_eq(sock_net(sk), net) || udp_sk(sk)->udp_port_hash != hnum || From patchwork Wed Mar 15 15:42:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 13176202 X-Patchwork-Delegate: kuba@kernel.org 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 882B4C61DA4 for ; Wed, 15 Mar 2023 15:43:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232358AbjCOPnA (ORCPT ); Wed, 15 Mar 2023 11:43:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58192 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232242AbjCOPm5 (ORCPT ); Wed, 15 Mar 2023 11:42:57 -0400 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D386D6FFF9 for ; Wed, 15 Mar 2023 08:42:53 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-540e3b152a3so144815877b3.2 for ; Wed, 15 Mar 2023 08:42:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1678894973; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=zM+PS+KsvJKkjk+P5uKoyjd33NWdGy5HDkijimHL/pc=; b=WMMl51I7iR3lESd8iXe3JeKTRFHigN2oLA0xys6N364QCMXV2jQ77R1nEc4qjt93x8 C9ntWdjYF4a49mUx/oCWMIKq85c8cmk46MLmX1TlOiEW73+RToDzp4hixm/oHstnOvQY O6Ihhtf7Z2Cg2pHdqsAU2KaG/HGffESQRPs7s0Ry13Ol2w+aVUtUYdKMRfJ7VBYV4t7n P8TRloGMR5cOG+5IVmSoq9i26rTijUE3cpVWE23J98KZp6LJ9hNnNvKr0vGAWM23EH7M O3kmgxx2ohhkuQQyahPsNCGS/azKNDMa6kKQ3bv62l1sDVVM6bDHuXOtaKF+z1gx6iu+ F+Zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678894973; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=zM+PS+KsvJKkjk+P5uKoyjd33NWdGy5HDkijimHL/pc=; b=J6jcBNJ/o7obCVjoZ1rFWPW9eAQ9uKdBbyYPuRpPsA6CzWjHYb3AA0gy9XFYgQXB27 dROBkDQMZijOncr1K8Wep8c2vpuK6BgUJoiahsEbT3aW/MZSrYu9W2cZAlw1XUZB64hk I1Pew+kL5f+YryaqyDid2EDN3opQDEGfbvuSyW+4LXqG2PXLB1LcHPtrdw8BvlyFKyMp a7Fz7u1BBK4XqTzjQKbpi1qyNvmJsuFo0Jdgr68IACe1EUwVyUzkJqaV9pJ4XUBW2ZQo 8QLLtAFGgptaC3bejkFn2vU5M70qtwmzi8NxSsslcEM/MbwErAeIxvRuILWM4z9AwmUE NL5A== X-Gm-Message-State: AO0yUKUWESLzxa15piHQpZsYJZS0grXyhfr+XuLyF+AzyGcZfViqLybK X98vIl723ICCyUjsA4WlmCkuyql3WpRaDw== X-Google-Smtp-Source: AK7set8MXTjCMuNCm9GEW8pzt111E0K12BvHswhP1w4p/FCTcACjUXNfTBQZti5C256UjUZ7KJvgLWUIb1GnKQ== X-Received: from edumazet1.c.googlers.com ([fda3:e722:ac3:cc00:2b:7d90:c0a8:395a]) (user=edumazet job=sendgmr) by 2002:a05:6902:312:b0:a58:af0b:5150 with SMTP id b18-20020a056902031200b00a58af0b5150mr21704987ybs.3.1678894973106; Wed, 15 Mar 2023 08:42:53 -0700 (PDT) Date: Wed, 15 Mar 2023 15:42:41 +0000 In-Reply-To: <20230315154245.3405750-1-edumazet@google.com> Mime-Version: 1.0 References: <20230315154245.3405750-1-edumazet@google.com> X-Mailer: git-send-email 2.40.0.rc1.284.g88254d51c5-goog Message-ID: <20230315154245.3405750-5-edumazet@google.com> Subject: [PATCH net-next 4/8] ipv6: constify inet6_mc_check() From: Eric Dumazet To: "David S . Miller" , Jakub Kicinski , Paolo Abeni Cc: David Ahern , netdev@vger.kernel.org, eric.dumazet@gmail.com, Eric Dumazet Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org inet6_mc_check() is essentially a read-only function. Signed-off-by: Eric Dumazet Reviewed-by: Simon Horman --- include/net/addrconf.h | 2 +- net/ipv6/mcast.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/net/addrconf.h b/include/net/addrconf.h index c04f359655b86feed2b4b42cc69b90c63088238a..82da55101b5a30b2a5512d964429d2c5f73d03fd 100644 --- a/include/net/addrconf.h +++ b/include/net/addrconf.h @@ -223,7 +223,7 @@ int ipv6_sock_mc_drop(struct sock *sk, int ifindex, const struct in6_addr *addr); void __ipv6_sock_mc_close(struct sock *sk); void ipv6_sock_mc_close(struct sock *sk); -bool inet6_mc_check(struct sock *sk, const struct in6_addr *mc_addr, +bool inet6_mc_check(const struct sock *sk, const struct in6_addr *mc_addr, const struct in6_addr *src_addr); int ipv6_dev_mc_inc(struct net_device *dev, const struct in6_addr *addr); diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c index 1c02160cf7a4c54f0d8687b8368e5f6151ab0bce..714cdc9e2b8edfb925a061a722c38b37b1c6088e 100644 --- a/net/ipv6/mcast.c +++ b/net/ipv6/mcast.c @@ -627,12 +627,12 @@ int ip6_mc_msfget(struct sock *sk, struct group_filter *gsf, return 0; } -bool inet6_mc_check(struct sock *sk, const struct in6_addr *mc_addr, +bool inet6_mc_check(const struct sock *sk, const struct in6_addr *mc_addr, const struct in6_addr *src_addr) { - struct ipv6_pinfo *np = inet6_sk(sk); - struct ipv6_mc_socklist *mc; - struct ip6_sf_socklist *psl; + const struct ipv6_pinfo *np = inet6_sk(sk); + const struct ipv6_mc_socklist *mc; + const struct ip6_sf_socklist *psl; bool rv = true; rcu_read_lock(); From patchwork Wed Mar 15 15:42:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 13176203 X-Patchwork-Delegate: kuba@kernel.org 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 16EC2C6FD1D for ; Wed, 15 Mar 2023 15:43:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232384AbjCOPnC (ORCPT ); Wed, 15 Mar 2023 11:43:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58194 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232360AbjCOPm5 (ORCPT ); Wed, 15 Mar 2023 11:42:57 -0400 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0C7ED7B980 for ; Wed, 15 Mar 2023 08:42:55 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-540e3b152a3so144816457b3.2 for ; Wed, 15 Mar 2023 08:42:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1678894974; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=dbZoz4QOzziJUbuQwPzjqvaM0Lu47sMx74iGpmk1hNw=; b=YL6QHsu8plPHV9DKcxccjd3SaL5mFsHRw4vwKIs09orUwX+Z5UldviWCanG5krd2uZ QZkLNxNBADO73TjxGW/JHuoWnpvtnX50pHv4IMOSQ4595A4IO5nneJ9J5jyAgqgTawfU S2tEmfLm1y6h0vAhBwJ7pL2G42sPA8vVhWMgPND+UIPe+gH7Eu+QSpAUZOIFWiY8SeCf CxfJ9uqQ45+g4xHygVchuIG1V7J5mbQppBMYIy5CaApnF/Ep6BZlY2kHjP9TkzR8dylE Z6gLqz5iZSWR7ENJPRjUZV0ABKl7m57tB8GNBmYMzsQCt0RrCK6kCBye674TehpR5DJf cXWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678894974; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=dbZoz4QOzziJUbuQwPzjqvaM0Lu47sMx74iGpmk1hNw=; b=DcrvpgoKYPKQJxWYUCQvQ4TlhW28wKG9tOUrYM4eMIsNJqR04GI5PmR7vy8LKf1aLD KCgmp8svAm6m1f/BECmQgHcQX3xJUCdDE4zI/uER/RXJT6TJwsjT3L/9dt13ji+kGwpK xG24iMV6NI0y1EfmENtGWySfNQMF/jkpZ1hW1ifx0IG3sIy0GLlLuSOqSIbOwTBkahop 6wZ+zodb5OdaKLKSZZgidWozPf0TdQIE6yOeQUXU/YIK3NlzEl3y/DJdORGABNBou2ja Q+XGBOLxKh7Uh6R+LhE33Gzft0NqliWBjqDIvcOkJjzFWGbL7MPZ9wsza4OROCYrSndk Wadg== X-Gm-Message-State: AO0yUKUVpGEJaZP8v+PGZ7TGz6uM7xFkWCB+oB+xQ0i2VZqaMygolD6T AXWBejotgBaY4d8Qu/SKIE7kzaOjG/pKTg== X-Google-Smtp-Source: AK7set86kAnup/kVwk37FCIlkB3O1Emmes728lSAbpIWuOyMYbAR4B79OQSTP1iV9B5FLvtm20Ztxw5dvPgclg== X-Received: from edumazet1.c.googlers.com ([fda3:e722:ac3:cc00:2b:7d90:c0a8:395a]) (user=edumazet job=sendgmr) by 2002:a81:a9c3:0:b0:541:9b2b:8240 with SMTP id g186-20020a81a9c3000000b005419b2b8240mr206735ywh.6.1678894974745; Wed, 15 Mar 2023 08:42:54 -0700 (PDT) Date: Wed, 15 Mar 2023 15:42:42 +0000 In-Reply-To: <20230315154245.3405750-1-edumazet@google.com> Mime-Version: 1.0 References: <20230315154245.3405750-1-edumazet@google.com> X-Mailer: git-send-email 2.40.0.rc1.284.g88254d51c5-goog Message-ID: <20230315154245.3405750-6-edumazet@google.com> Subject: [PATCH net-next 5/8] udp6: constify __udp_v6_is_mcast_sock() socket argument From: Eric Dumazet To: "David S . Miller" , Jakub Kicinski , Paolo Abeni Cc: David Ahern , netdev@vger.kernel.org, eric.dumazet@gmail.com, Eric Dumazet Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org This clarifies __udp_v6_is_mcast_sock() intent. Signed-off-by: Eric Dumazet Reviewed-by: Simon Horman --- net/ipv6/udp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index ab4ae886235ac9557219c901c5041adfa8b026ef..d350e57c479299e732bd3595c1964acddde2d876 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -805,12 +805,12 @@ static int udpv6_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) return 0; } -static bool __udp_v6_is_mcast_sock(struct net *net, struct sock *sk, +static bool __udp_v6_is_mcast_sock(struct net *net, const struct sock *sk, __be16 loc_port, const struct in6_addr *loc_addr, __be16 rmt_port, const struct in6_addr *rmt_addr, int dif, int sdif, unsigned short hnum) { - struct inet_sock *inet = inet_sk(sk); + const struct inet_sock *inet = inet_sk(sk); if (!net_eq(sock_net(sk), net)) return false; From patchwork Wed Mar 15 15:42:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 13176204 X-Patchwork-Delegate: kuba@kernel.org 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BFEF3C6FD1D for ; Wed, 15 Mar 2023 15:43:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232348AbjCOPnG (ORCPT ); Wed, 15 Mar 2023 11:43:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58216 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232103AbjCOPnA (ORCPT ); Wed, 15 Mar 2023 11:43:00 -0400 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DD45B7A928 for ; Wed, 15 Mar 2023 08:42:56 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-536d63d17dbso205520837b3.22 for ; Wed, 15 Mar 2023 08:42:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1678894976; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=FIZYIEauPwwiaTeaz6iQAPztD5zSSpkzaJXr8Sk0BNI=; b=rNRpkAGWv/tmql8p9E7CGU3wa4F5nSx8RF10EsG3J7RSkkd3A3O+QSv/jaFvUfbtv8 JYMEhLsy/g9SZnwPVBWPR4HxIb/xgskdp7uuhU05uQGuZoZEa8eHnYEwIoFA9M3i/LUt Ix8ocWe1u1iDDeG84rA7P682r0gCJaXujIHr6MBgWbSem5SGoxMdfhtGo87bItiYdlZG vbxEsmBh0iNhI9aghKayJgXMMnorXFz+W0Ix5UF37U0g+4jk8xAV1wDCdNQyfGDHDGjN nGWUnY0n/iZNXalX9gNhfssK/S9qwlsn0+7twL6bfWQNXNCXdHBj0WSWhcE+OejjaABL R2VA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678894976; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=FIZYIEauPwwiaTeaz6iQAPztD5zSSpkzaJXr8Sk0BNI=; b=5si+XVORh3K+OG0Nu/yhf4RqP8rOLOIY2gMzvAkZGMxbo/EgtuEfnsgSNddLs0uxv7 a7TqvGTcv604Ne5mXHCl4z4Ey4kjyciIAn4DLFBDxPe11FryNCWNBid51QiGf0HN0IAi /IHIx5SXTuyCipEvUoJNL1/5suSyJj5PUNYR/0nxbaW1mErtYw8w3hPK8bXOs9PHm9Bv hO1zJ5u4/asf/msPDpe1S3nLER+DvEak9hsWqCcTuXYrt8j9FfsN54bySm7qxpNQubQr uTyEuss9S8Lsjr5/uvip2OGyMsSGNo72Hqo+hCC+Lb1GKc5r8oQ5yD1vTrf7JMSssuMb 6gAQ== X-Gm-Message-State: AO0yUKUtOUxzEifYH+n8vLhWPQ86zq3QTGfxKpz9/maHOmgELdq0hK3H kpDKdaXw4tuwgb2A5FzAdUk8BVLQ5CKmIg== X-Google-Smtp-Source: AK7set8ERm1PuXCVRKG19uU1hTvZMQaP9dOUy4OOhID7ZgVW0nfTGNCwAftqBUee604yya8VkgEAfamBKBaNQg== X-Received: from edumazet1.c.googlers.com ([fda3:e722:ac3:cc00:2b:7d90:c0a8:395a]) (user=edumazet job=sendgmr) by 2002:a05:6902:185:b0:9fe:1493:8b9 with SMTP id t5-20020a056902018500b009fe149308b9mr21646433ybh.8.1678894976153; Wed, 15 Mar 2023 08:42:56 -0700 (PDT) Date: Wed, 15 Mar 2023 15:42:43 +0000 In-Reply-To: <20230315154245.3405750-1-edumazet@google.com> Mime-Version: 1.0 References: <20230315154245.3405750-1-edumazet@google.com> X-Mailer: git-send-email 2.40.0.rc1.284.g88254d51c5-goog Message-ID: <20230315154245.3405750-7-edumazet@google.com> Subject: [PATCH net-next 6/8] ipv6: raw: constify raw_v6_match() socket argument From: Eric Dumazet To: "David S . Miller" , Jakub Kicinski , Paolo Abeni Cc: David Ahern , netdev@vger.kernel.org, eric.dumazet@gmail.com, Eric Dumazet Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org This clarifies raw_v6_match() intent. Signed-off-by: Eric Dumazet Reviewed-by: Simon Horman --- include/net/rawv6.h | 2 +- net/ipv6/raw.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/net/rawv6.h b/include/net/rawv6.h index bc70909625f60dcd819f50a258841d20e5ba0c68..82810cbe37984437569186783f39f166e89cb9b8 100644 --- a/include/net/rawv6.h +++ b/include/net/rawv6.h @@ -6,7 +6,7 @@ #include extern struct raw_hashinfo raw_v6_hashinfo; -bool raw_v6_match(struct net *net, struct sock *sk, unsigned short num, +bool raw_v6_match(struct net *net, const struct sock *sk, unsigned short num, const struct in6_addr *loc_addr, const struct in6_addr *rmt_addr, int dif, int sdif); diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c index bac9ba747bdecf8df24acb6c980a822d8f237403..6ac2f2690c44c96e9ac4cb7368ee7abdbeaf4334 100644 --- a/net/ipv6/raw.c +++ b/net/ipv6/raw.c @@ -64,7 +64,7 @@ struct raw_hashinfo raw_v6_hashinfo; EXPORT_SYMBOL_GPL(raw_v6_hashinfo); -bool raw_v6_match(struct net *net, struct sock *sk, unsigned short num, +bool raw_v6_match(struct net *net, const struct sock *sk, unsigned short num, const struct in6_addr *loc_addr, const struct in6_addr *rmt_addr, int dif, int sdif) { From patchwork Wed Mar 15 15:42:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 13176205 X-Patchwork-Delegate: kuba@kernel.org 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 393DCC6FD1D for ; Wed, 15 Mar 2023 15:43:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232278AbjCOPnN (ORCPT ); Wed, 15 Mar 2023 11:43:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58398 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232365AbjCOPnC (ORCPT ); Wed, 15 Mar 2023 11:43:02 -0400 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B0DA8975A for ; Wed, 15 Mar 2023 08:42:58 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id m13-20020a25800d000000b00b3dfeba6814so9732758ybk.11 for ; Wed, 15 Mar 2023 08:42:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1678894978; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=dlkJqv0b0Jem9BwwJCn3175Kp26LnlRSt2mhLf1rgJw=; b=L1OrWZzqWO4U8JLmwN7arX4Mls1srN+H90FWfXx6S6tefkuy0IKYOicZXMwhb+oEEI JsIAOy4pNFtB660WWTael+2fiVwwjxlmNIb/E4ELk0hU3wt4ZXmP0Fx2NLBcgglt1N2b ehkj0Wa/BZGOMJ9Vylj8XR9yCmmyXoLbTCpOaVUtA1yeUwvZFZQE0wIKIrhdzpwcRFRa 7ofE0nqSJXSW/mkUxyTWIEd7//12t3ij9ebOlK9RMLjgTlWFQlmmzVUTbN7AgmKqek4w c+XUB7abMmS5er5bPP3jX8cAYL9Oxu1G/dx5w51vK2i2FHb6H/P0tMXHcxBHs7IuI46s a1cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678894978; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=dlkJqv0b0Jem9BwwJCn3175Kp26LnlRSt2mhLf1rgJw=; b=sJ9l7JlyJU5DBRU14pD3+nm0Tw+EtEqSzOlIfGRxqlepI12fyDfDymQxOke9TGdTK0 YAGjxyemACeup8bN9G/xWTxm7X12sgC5xOQKXEPy4LAusAMpkyOr2KFXGCZizl9EX2eL enQwFVT/LFvLru0xqt7O7p7IPFIKDGUM59unsEFM5ZsMp2gymvJnTBRP1dAGMgr/0SOR w4eh+fVgwQd0yvMtKdxblnoEqh2IehCwWNcJTDhdPWSZr8Adu7BOBnKyWYNxYKz/tmZ6 a8Kr3rwJIHmy2Q3lZYzZXMfSCODU3FFX7VCneL3hh/GD8uNMU+bf7Ulzr7MrvcmtSkgB nmlw== X-Gm-Message-State: AO0yUKXr7Albx9pkUKwiM4WUduce7hI0WI4m/FC8EP0Ed58+zm+YrJ4L xovYoYnEd7cZpXnPSULM1OM8CRMnXeHXCQ== X-Google-Smtp-Source: AK7set8IhlNqZeVsGMufz+PNOl3ycNCTKla8J9pZYbAw9AJD2w2TFf235W/238+Mq97PVLgFiL361mabfwEGMg== X-Received: from edumazet1.c.googlers.com ([fda3:e722:ac3:cc00:2b:7d90:c0a8:395a]) (user=edumazet job=sendgmr) by 2002:a81:4417:0:b0:541:6d4c:9276 with SMTP id r23-20020a814417000000b005416d4c9276mr205995ywa.5.1678894977933; Wed, 15 Mar 2023 08:42:57 -0700 (PDT) Date: Wed, 15 Mar 2023 15:42:44 +0000 In-Reply-To: <20230315154245.3405750-1-edumazet@google.com> Mime-Version: 1.0 References: <20230315154245.3405750-1-edumazet@google.com> X-Mailer: git-send-email 2.40.0.rc1.284.g88254d51c5-goog Message-ID: <20230315154245.3405750-8-edumazet@google.com> Subject: [PATCH net-next 7/8] ipv4: raw: constify raw_v4_match() socket argument From: Eric Dumazet To: "David S . Miller" , Jakub Kicinski , Paolo Abeni Cc: David Ahern , netdev@vger.kernel.org, eric.dumazet@gmail.com, Eric Dumazet Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org This clarifies raw_v4_match() intent. Signed-off-by: Eric Dumazet Reviewed-by: Simon Horman --- include/net/raw.h | 2 +- net/ipv4/raw.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/net/raw.h b/include/net/raw.h index 2c004c20ed996d1dbe07f2c8d25edd2ce03cca03..7ad15830cf38460f1fae3a187986d74faef6dd1d 100644 --- a/include/net/raw.h +++ b/include/net/raw.h @@ -22,7 +22,7 @@ extern struct proto raw_prot; extern struct raw_hashinfo raw_v4_hashinfo; -bool raw_v4_match(struct net *net, struct sock *sk, unsigned short num, +bool raw_v4_match(struct net *net, const struct sock *sk, unsigned short num, __be32 raddr, __be32 laddr, int dif, int sdif); int raw_abort(struct sock *sk, int err); diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c index 94df935ee0c5a83a4b1393653b79ac6060b4f12a..3cf68695b40ddc0e79c8fbd62f317048cf5c88e3 100644 --- a/net/ipv4/raw.c +++ b/net/ipv4/raw.c @@ -116,10 +116,10 @@ void raw_unhash_sk(struct sock *sk) } EXPORT_SYMBOL_GPL(raw_unhash_sk); -bool raw_v4_match(struct net *net, struct sock *sk, unsigned short num, +bool raw_v4_match(struct net *net, const struct sock *sk, unsigned short num, __be32 raddr, __be32 laddr, int dif, int sdif) { - struct inet_sock *inet = inet_sk(sk); + const struct inet_sock *inet = inet_sk(sk); if (net_eq(sock_net(sk), net) && inet->inet_num == num && !(inet->inet_daddr && inet->inet_daddr != raddr) && From patchwork Wed Mar 15 15:42:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 13176206 X-Patchwork-Delegate: kuba@kernel.org 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 545E0C7618D for ; Wed, 15 Mar 2023 15:43:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232405AbjCOPnP (ORCPT ); Wed, 15 Mar 2023 11:43:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58786 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232479AbjCOPnK (ORCPT ); Wed, 15 Mar 2023 11:43:10 -0400 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2FCBC7A92F for ; Wed, 15 Mar 2023 08:43:00 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-540e3b152a3so144818227b3.2 for ; Wed, 15 Mar 2023 08:42:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1678894979; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=P6fXsD9tdN4Hcq/yJ62UIKt/XJRYN2tPURfjPLUEjr0=; b=TAJGmWSknxXEUNMGDSE3hD+8EEJWMyJnRMuJ6IRKRiILOjS3LsNwUL8jcsGPbj7YO/ vjmgHNQcdF54rbo+o5CI6l6CPCqrjuw2TVjEoLqZsMH3mNUWtyrbdPgS9VFfsNvgZ+oJ UIAbYZ//yqiiCmU3ExQELT/Ri2c26+ICGx2y6m+QciQqRwmLp2RWUV6Y25w7D2qRSaUo Fde3a+POQXetmZyMTYSoK/qYvrbA405wZpkIT2jw4PaZl5zvyprqaB2OX99gm+SwkCOz KgM+DkQMXeBaBsc1mnFB401F5cV0gAFSa4P03RGmgi+ppsoaNHDO6tRuM1h0PD9o7LIM YdrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678894979; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=P6fXsD9tdN4Hcq/yJ62UIKt/XJRYN2tPURfjPLUEjr0=; b=EKUHz8g/5wt//qVyFZA3p/FMjgvJuk0G0GoUKOqRGAuqS+SXlhTwKfVvQHNO9R2Oh8 74pItkq503Tj2hSieYQXxBWoHbKHk6zn94/NoOnZRn19bC2Qwu8bkZpGtMv3hcoLWGkl ivkfRdQadcll4j4oirIpG41uejoU7De8GAhVs9J1iMEQ0KGgNZPk1nKiEOW2BzcC+e+F et9db9Gu2qeqqC9GYrz+xIJGc9S+j2hg3lEm6XSFK3/asZcSQDUOxAZAHzHwdfEhCtQj 7k3VV4wsd6Kv/h7MBKLZztMLWXhLvst9Jjk/ORPKhBfV12Hga/9WsKg+pHM/bXGhSRPv 9mrw== X-Gm-Message-State: AO0yUKUo+c1mbHASdhNeZTidKGlpyCi3CA9jm0aHjJYQKyA9wR1TrkK+ FW0U0ZztX3HfYFNat5d5s8ABC1LZ5nr6Vg== X-Google-Smtp-Source: AK7set+tulwZYMGJLOVNu3J8XAiwYot78L2UoqTnWDoSvFc/Hk32N9jEnzP/srSPu/OCmgC2zB/152v/ehCFxA== X-Received: from edumazet1.c.googlers.com ([fda3:e722:ac3:cc00:2b:7d90:c0a8:395a]) (user=edumazet job=sendgmr) by 2002:a05:6902:208:b0:9fe:195a:ce0d with SMTP id j8-20020a056902020800b009fe195ace0dmr21470841ybs.10.1678894979655; Wed, 15 Mar 2023 08:42:59 -0700 (PDT) Date: Wed, 15 Mar 2023 15:42:45 +0000 In-Reply-To: <20230315154245.3405750-1-edumazet@google.com> Mime-Version: 1.0 References: <20230315154245.3405750-1-edumazet@google.com> X-Mailer: git-send-email 2.40.0.rc1.284.g88254d51c5-goog Message-ID: <20230315154245.3405750-9-edumazet@google.com> Subject: [PATCH net-next 8/8] inet_diag: constify raw_lookup() socket argument From: Eric Dumazet To: "David S . Miller" , Jakub Kicinski , Paolo Abeni Cc: David Ahern , netdev@vger.kernel.org, eric.dumazet@gmail.com, Eric Dumazet Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Now both raw_v4_match() and raw_v6_match() accept a const socket, raw_lookup() can do the same to clarify its role. Signed-off-by: Eric Dumazet Reviewed-by: Simon Horman --- net/ipv4/raw_diag.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv4/raw_diag.c b/net/ipv4/raw_diag.c index 999321834b94a8f7f2a4996575b7cfaafb6fa2b7..bca49a844f01083cdfdade6f52852d48ddb36d70 100644 --- a/net/ipv4/raw_diag.c +++ b/net/ipv4/raw_diag.c @@ -34,7 +34,7 @@ raw_get_hashinfo(const struct inet_diag_req_v2 *r) * use helper to figure it out. */ -static bool raw_lookup(struct net *net, struct sock *sk, +static bool raw_lookup(struct net *net, const struct sock *sk, const struct inet_diag_req_v2 *req) { struct inet_diag_req_raw *r = (void *)req;