From patchwork Tue Jul 11 13:06:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guillaume Nault X-Patchwork-Id: 13308717 X-Patchwork-Delegate: kuba@kernel.org Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 82C5218C02 for ; Tue, 11 Jul 2023 13:06:21 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 55B3CE4D for ; Tue, 11 Jul 2023 06:06:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689080776; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=SM6Dln3l3j8xg3Tg92S1MqQlhpmKfV5kvtVaEQF2IiA=; b=Et5CNRunjR79kJAGQkyfa4MoLapFYzawh5Cp64ofC+6CsMYnqF4PqGXPbxci6BA/tMpylP +tQKFxYyP24JW8KXrcR3eKOyZr6OIl33wTpZXt6K8Ki6DMtF/24rqGJ5qRODEwLxCicn5x T3mnHyisEofhqG8olLurpRtRGyq99KQ= Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-611-lEuIMdJqPhGakBECn4PSqA-1; Tue, 11 Jul 2023 09:06:15 -0400 X-MC-Unique: lEuIMdJqPhGakBECn4PSqA-1 Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-7679e5ebad2so839698185a.3 for ; Tue, 11 Jul 2023 06:06:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689080774; x=1691672774; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=SM6Dln3l3j8xg3Tg92S1MqQlhpmKfV5kvtVaEQF2IiA=; b=GFu8quD55y/6rqE1d4HlwlVqrHa/4mO8vxFQBXOLSWriOFhIjWvfWLGzCkFTTwk8+v xu0ccQ5AflqrK1yOxTPO+NjUkz079IOdgm/PFEZU6hzxFoQw6hu8PYkblPoW+g6rFiLX aHI8jLEGQn9yaY1j4urlmOH+QdMd5wbaKPKEPur1YzV7etYLE6u5HQGe61Af/4/8OBpP oQEZJ979xTBdZGt30Ah75Yzf48B1j+51dz7ojtExhoyjfr/8hJHcgT5TuXdIH/+Q/3y3 57fwXrbLeSMW+VVCMXnDtl8ubZK+arnb3qzxx7Y4wAPTf/9fBLQZJerPO8QnScme2RpQ i/xw== X-Gm-Message-State: ABy/qLZnH8fNF7UY+Vx5w2JUA6JsQJsgmypQDgJ6LEsDO3kGJatF34qF tHaX44UadKHs1xP0KriSvlL5Z2k5t/9H4lt7NJqYbrmRrB7SzYk1n3W7pI0egKrPaHk3fgAX39q 7mDzwW+q9GLofVZEG X-Received: by 2002:a05:620a:47a2:b0:766:ff8a:d029 with SMTP id dt34-20020a05620a47a200b00766ff8ad029mr15069482qkb.17.1689080774694; Tue, 11 Jul 2023 06:06:14 -0700 (PDT) X-Google-Smtp-Source: APBJJlFX2q0I7mymQvTaakJlHhcvVLWoSBzEETV7kqeC5kaFsoVo/fxRf+qhkEs29d/KEzH0o5oSNg== X-Received: by 2002:a05:620a:47a2:b0:766:ff8a:d029 with SMTP id dt34-20020a05620a47a200b00766ff8ad029mr15069463qkb.17.1689080774479; Tue, 11 Jul 2023 06:06:14 -0700 (PDT) Received: from debian ([92.62.32.42]) by smtp.gmail.com with ESMTPSA id x12-20020a05620a14ac00b007659935ce64sm960465qkj.71.2023.07.11.06.06.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jul 2023 06:06:14 -0700 (PDT) Date: Tue, 11 Jul 2023 15:06:08 +0200 From: Guillaume Nault To: David Miller , Jakub Kicinski , Paolo Abeni , Eric Dumazet Cc: netdev@vger.kernel.org, Paul Moore , Eric Paris , linux-security-module@vger.kernel.org, selinux@vger.kernel.org Subject: [PATCH net-next 1/4] security: Constify sk in the sk_getsecid hook. Message-ID: <980e4d705147a44b119fe30565c40e2424dce563.1689077819.git.gnault@redhat.com> References: Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net X-Patchwork-Delegate: kuba@kernel.org The sk_getsecid hook shouldn't need to modify its socket argument. Make it const so that callers of security_sk_classify_flow() can use a const struct sock *. Signed-off-by: Guillaume Nault Reviewed-by: Simon Horman --- include/linux/lsm_hook_defs.h | 2 +- include/linux/security.h | 5 +++-- security/security.c | 2 +- security/selinux/hooks.c | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/include/linux/lsm_hook_defs.h b/include/linux/lsm_hook_defs.h index 7308a1a7599b..4f2621e87634 100644 --- a/include/linux/lsm_hook_defs.h +++ b/include/linux/lsm_hook_defs.h @@ -316,7 +316,7 @@ LSM_HOOK(int, 0, sk_alloc_security, struct sock *sk, int family, gfp_t priority) LSM_HOOK(void, LSM_RET_VOID, sk_free_security, struct sock *sk) LSM_HOOK(void, LSM_RET_VOID, sk_clone_security, const struct sock *sk, struct sock *newsk) -LSM_HOOK(void, LSM_RET_VOID, sk_getsecid, struct sock *sk, u32 *secid) +LSM_HOOK(void, LSM_RET_VOID, sk_getsecid, const struct sock *sk, u32 *secid) LSM_HOOK(void, LSM_RET_VOID, sock_graft, struct sock *sk, struct socket *parent) LSM_HOOK(int, 0, inet_conn_request, const struct sock *sk, struct sk_buff *skb, struct request_sock *req) diff --git a/include/linux/security.h b/include/linux/security.h index 32828502f09e..994cf099d9ac 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -1439,7 +1439,8 @@ int security_socket_getpeersec_dgram(struct socket *sock, struct sk_buff *skb, u int security_sk_alloc(struct sock *sk, int family, gfp_t priority); void security_sk_free(struct sock *sk); void security_sk_clone(const struct sock *sk, struct sock *newsk); -void security_sk_classify_flow(struct sock *sk, struct flowi_common *flic); +void security_sk_classify_flow(const struct sock *sk, + struct flowi_common *flic); void security_req_classify_flow(const struct request_sock *req, struct flowi_common *flic); void security_sock_graft(struct sock*sk, struct socket *parent); @@ -1597,7 +1598,7 @@ static inline void security_sk_clone(const struct sock *sk, struct sock *newsk) { } -static inline void security_sk_classify_flow(struct sock *sk, +static inline void security_sk_classify_flow(const struct sock *sk, struct flowi_common *flic) { } diff --git a/security/security.c b/security/security.c index b720424ca37d..2dfc7b9f6ed9 100644 --- a/security/security.c +++ b/security/security.c @@ -4396,7 +4396,7 @@ void security_sk_clone(const struct sock *sk, struct sock *newsk) } EXPORT_SYMBOL(security_sk_clone); -void security_sk_classify_flow(struct sock *sk, struct flowi_common *flic) +void security_sk_classify_flow(const struct sock *sk, struct flowi_common *flic) { call_void_hook(sk_getsecid, sk, &flic->flowic_secid); } diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index d06e350fedee..2bdc48dd8670 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -5167,12 +5167,12 @@ static void selinux_sk_clone_security(const struct sock *sk, struct sock *newsk) selinux_netlbl_sk_security_reset(newsksec); } -static void selinux_sk_getsecid(struct sock *sk, u32 *secid) +static void selinux_sk_getsecid(const struct sock *sk, u32 *secid) { if (!sk) *secid = SECINITSID_ANY_SOCKET; else { - struct sk_security_struct *sksec = sk->sk_security; + const struct sk_security_struct *sksec = sk->sk_security; *secid = sksec->sid; } From patchwork Tue Jul 11 13:06:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guillaume Nault X-Patchwork-Id: 13308718 X-Patchwork-Delegate: kuba@kernel.org Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0E00F18C02 for ; Tue, 11 Jul 2023 13:06:35 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 924241710 for ; Tue, 11 Jul 2023 06:06:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689080783; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=jhHE1KP3Eg1fH7yJTxAtaCDI0xpIOjhq6HVm2UfMJCc=; b=Jg9es/bfYxZMALzqz3jT6mGgD8Mrg8iNJ48/KzVIFYP7v9tmjKYJleTa5NVPBA7WJdGPd5 A0xPeepKnH1bFL3RT5spyXiUd/9tQx4nQmhC8ftoMORWuk3ZRNjZZKqp4E2V6XTv3xHSuP zN7Cl2+ie9fr936vF9sB/9GvaSzD1Wk= Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-513-wxcdXfqiMpmBWmJat99v6g-1; Tue, 11 Jul 2023 09:06:22 -0400 X-MC-Unique: wxcdXfqiMpmBWmJat99v6g-1 Received: by mail-qv1-f69.google.com with SMTP id 6a1803df08f44-635a3b9d24eso46354406d6.0 for ; Tue, 11 Jul 2023 06:06:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689080781; x=1691672781; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=jhHE1KP3Eg1fH7yJTxAtaCDI0xpIOjhq6HVm2UfMJCc=; b=NS0hE96Io8LUs6g/sGFphH9HObvXvKDSc/c9VA5p7RVfQsNpHlgUXggNpa8J5Wss7n D4K7pvb6Ju8V8m03SUO4FAbfSiZyURsaM2F6AATwAHKW2mW33ExE28sKb/wn2ikGMr3R KWD9i5prZ+m3vu/fb+onPOTu73WYaihHk1rNHuqMP7cRjlS/8mAuTnv6gcuKJz+V7TU/ eFLqySacRiRFrNpz187TTngsiGSFhQjj5WXXd/OaSZ/1+5FyikA5HPn6a4gzHx8HcUm6 FQTJxPu8DiUDgrIAOfDiMg/2YkOJXb6o6iPZlz/X9B50tFsQLubEvRdbnt7ohYEsSSaY m+AA== X-Gm-Message-State: ABy/qLZugQDYs/H9wcs/lPD1962Gf7dWfeI5lVBgYP4eOZgXSgPiEqij gHtl7fHPtQvVOsBLQ5T3Sk1l3CVUZZKpmgRshbFDIaSSmTGeJbrUF9TIeXK12MsSNLvUPB36gcS pxeUaFvsDySP1LmINJPgO9crQ X-Received: by 2002:a0c:cb14:0:b0:62f:eb6d:1796 with SMTP id o20-20020a0ccb14000000b0062feb6d1796mr11939774qvk.30.1689080781430; Tue, 11 Jul 2023 06:06:21 -0700 (PDT) X-Google-Smtp-Source: APBJJlEMZPsRke6ph+eFqrQbvXN5A08b/Y9KSSaxpS6KgupBqp1a8yCCdrYkbViNUsXAI0QjcbNIZQ== X-Received: by 2002:a0c:cb14:0:b0:62f:eb6d:1796 with SMTP id o20-20020a0ccb14000000b0062feb6d1796mr11939735qvk.30.1689080780857; Tue, 11 Jul 2023 06:06:20 -0700 (PDT) Received: from debian ([92.62.32.42]) by smtp.gmail.com with ESMTPSA id q8-20020a0c8cc8000000b0062ffcda34c6sm1026729qvb.137.2023.07.11.06.06.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jul 2023 06:06:20 -0700 (PDT) Date: Tue, 11 Jul 2023 15:06:14 +0200 From: Guillaume Nault To: David Miller , Jakub Kicinski , Paolo Abeni , Eric Dumazet Cc: netdev@vger.kernel.org, David Ahern Subject: [PATCH net-next 2/4] ipv4: Constify the sk parameter of ip_route_output_*(). Message-ID: <195d71a41fb3e6d2fc36bc843e5909c9240ef163.1689077819.git.gnault@redhat.com> References: Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net X-Patchwork-Delegate: kuba@kernel.org These functions don't need to modify the socket, so let's allow the callers to pass a const struct sock *. Signed-off-by: Guillaume Nault Reviewed-by: Simon Horman Reviewed-by: David Ahern --- include/net/route.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/net/route.h b/include/net/route.h index 5a5c726472bd..d8d150155195 100644 --- a/include/net/route.h +++ b/include/net/route.h @@ -163,7 +163,7 @@ static inline struct rtable *ip_route_output(struct net *net, __be32 daddr, } static inline struct rtable *ip_route_output_ports(struct net *net, struct flowi4 *fl4, - struct sock *sk, + const struct sock *sk, __be32 daddr, __be32 saddr, __be16 dport, __be16 sport, __u8 proto, __u8 tos, int oif) @@ -309,7 +309,7 @@ static inline void ip_route_connect_init(struct flowi4 *fl4, __be32 dst, static inline struct rtable *ip_route_connect(struct flowi4 *fl4, __be32 dst, __be32 src, int oif, u8 protocol, __be16 sport, __be16 dport, - struct sock *sk) + const struct sock *sk) { struct net *net = sock_net(sk); struct rtable *rt; @@ -330,7 +330,7 @@ static inline struct rtable *ip_route_connect(struct flowi4 *fl4, __be32 dst, static inline struct rtable *ip_route_newports(struct flowi4 *fl4, struct rtable *rt, __be16 orig_sport, __be16 orig_dport, __be16 sport, __be16 dport, - struct sock *sk) + const struct sock *sk) { if (sport != orig_sport || dport != orig_dport) { fl4->fl4_dport = dport; From patchwork Tue Jul 11 13:06:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guillaume Nault X-Patchwork-Id: 13308719 X-Patchwork-Delegate: kuba@kernel.org Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 82E0018C02 for ; Tue, 11 Jul 2023 13:06:38 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5A04598 for ; Tue, 11 Jul 2023 06:06:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689080788; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=S4UxQdp/748YKmly8xTnwGt7CRzv2lMZ1LWZ2RMF/iY=; b=jF9HbgSsl/xnmc+/RWNTCAlX2zHTsK3oawaBqH7FVWHJTMnPGO8hXBjJQJGnjrjTjVKjeO qhk1e7q0qBj4t4HbliKkD3w54+2aEv1FZTOkPEw3BVM3OXVMev6cPIAtf1fZRUSsg0CCLs OOYNomyjmoIyZnYzMlXRZBlhRUOHf50= Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-659-RwW1RCp6Oymzt3kAwlR32g-1; Tue, 11 Jul 2023 09:06:27 -0400 X-MC-Unique: RwW1RCp6Oymzt3kAwlR32g-1 Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-7624ca834b5so840782385a.0 for ; Tue, 11 Jul 2023 06:06:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689080786; x=1691672786; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=S4UxQdp/748YKmly8xTnwGt7CRzv2lMZ1LWZ2RMF/iY=; b=GA2UqGwC3npnzcN8BUcCgnXQeKehoWAFeZHJ1i/kcdqDwYykj532rBBWtKpNj/YLei 9bSMQeAL/TyS8FmZakhK1NkqkMP12BI6BcF78qYrhMrKMhDChMDHQ0FDQlBoV9SbMw5s eqSO5dY3WQ5AF4NAAcL/HvUz/omwzE4qxA063kv8uR2OSbTkVjuTKsjw79OxJuLUW9dJ xkd1PdxQS75HRWsjkPtLD81dRwKFidyLRjKg/KK5OSXaIAL9ndJvj53/lxxirPKeliIR ahfDsl6QAA7ak7+QxbQH6NzWLES3lpCzaQdiktdYz3mLyXTHcLNo7CjQXNFlY+x/SNbK Rteg== X-Gm-Message-State: ABy/qLZUTXIHwHu8+6wibEc4SP5pB8LzHdeBu9KrXps7KLtIY4blJJ50 gnw8fsAImcWKqWYeuFfBaf16HiZ4Kmex3bjGZcecCpZpEmQyQeTR6yKvVBvnAla0RFAUcABaPlp L2J0ot5AfQUv9yEkc X-Received: by 2002:a05:620a:2551:b0:767:7de5:85f2 with SMTP id s17-20020a05620a255100b007677de585f2mr19408430qko.68.1689080786684; Tue, 11 Jul 2023 06:06:26 -0700 (PDT) X-Google-Smtp-Source: APBJJlHcyYcD0n17FmHvuJcJGOJnNE0KzA64NIZiM7v9jh1GK9RTyTJiQ5muyg/YwfQwvgTSlpykWA== X-Received: by 2002:a05:620a:2551:b0:767:7de5:85f2 with SMTP id s17-20020a05620a255100b007677de585f2mr19408407qko.68.1689080786453; Tue, 11 Jul 2023 06:06:26 -0700 (PDT) Received: from debian ([92.62.32.42]) by smtp.gmail.com with ESMTPSA id x7-20020a05620a01e700b007621b1bcbbfsm957820qkn.102.2023.07.11.06.06.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jul 2023 06:06:26 -0700 (PDT) Date: Tue, 11 Jul 2023 15:06:21 +0200 From: Guillaume Nault To: David Miller , Jakub Kicinski , Paolo Abeni , Eric Dumazet Cc: netdev@vger.kernel.org, David Ahern Subject: [PATCH net-next 3/4] ipv6: Constify the sk parameter of several helper functions. Message-ID: <38ea4cdcbd51177aae71c2e9fd9ca4a837ae01ec.1689077819.git.gnault@redhat.com> References: Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net X-Patchwork-Delegate: kuba@kernel.org icmpv6_flow_init(), ip6_datagram_flow_key_init() and ip6_mc_hdr() don't need to modify their sk argument. Make that explicit using const. Signed-off-by: Guillaume Nault Reviewed-by: Simon Horman Reviewed-by: David Ahern --- include/linux/icmpv6.h | 10 ++++------ net/ipv6/datagram.c | 7 ++++--- net/ipv6/icmp.c | 6 ++---- net/ipv6/mcast.c | 8 +++----- 4 files changed, 13 insertions(+), 18 deletions(-) diff --git a/include/linux/icmpv6.h b/include/linux/icmpv6.h index db0f4fcfdaf4..e3b3b0fa2a8f 100644 --- a/include/linux/icmpv6.h +++ b/include/linux/icmpv6.h @@ -85,12 +85,10 @@ extern void icmpv6_param_prob_reason(struct sk_buff *skb, struct flowi6; struct in6_addr; -extern void icmpv6_flow_init(struct sock *sk, - struct flowi6 *fl6, - u8 type, - const struct in6_addr *saddr, - const struct in6_addr *daddr, - int oif); + +void icmpv6_flow_init(const struct sock *sk, struct flowi6 *fl6, u8 type, + const struct in6_addr *saddr, + const struct in6_addr *daddr, int oif); static inline void icmpv6_param_prob(struct sk_buff *skb, u8 code, int pos) { diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c index 9b6818453afe..d80d6024cafa 100644 --- a/net/ipv6/datagram.c +++ b/net/ipv6/datagram.c @@ -38,10 +38,11 @@ static bool ipv6_mapped_addr_any(const struct in6_addr *a) return ipv6_addr_v4mapped(a) && (a->s6_addr32[3] == 0); } -static void ip6_datagram_flow_key_init(struct flowi6 *fl6, struct sock *sk) +static void ip6_datagram_flow_key_init(struct flowi6 *fl6, + const struct sock *sk) { - struct inet_sock *inet = inet_sk(sk); - struct ipv6_pinfo *np = inet6_sk(sk); + const struct inet_sock *inet = inet_sk(sk); + const struct ipv6_pinfo *np = inet6_sk(sk); int oif = sk->sk_bound_dev_if; memset(fl6, 0, sizeof(*fl6)); diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c index 9edf1f45b1ed..988d21166837 100644 --- a/net/ipv6/icmp.c +++ b/net/ipv6/icmp.c @@ -1031,11 +1031,9 @@ static int icmpv6_rcv(struct sk_buff *skb) return 0; } -void icmpv6_flow_init(struct sock *sk, struct flowi6 *fl6, - u8 type, +void icmpv6_flow_init(const struct sock *sk, struct flowi6 *fl6, u8 type, const struct in6_addr *saddr, - const struct in6_addr *daddr, - int oif) + const struct in6_addr *daddr, int oif) { memset(fl6, 0, sizeof(*fl6)); fl6->saddr = *saddr; diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c index 714cdc9e2b8e..5ce25bcb9974 100644 --- a/net/ipv6/mcast.c +++ b/net/ipv6/mcast.c @@ -1699,11 +1699,9 @@ mld_scount(struct ifmcaddr6 *pmc, int type, int gdeleted, int sdeleted) return scount; } -static void ip6_mc_hdr(struct sock *sk, struct sk_buff *skb, - struct net_device *dev, - const struct in6_addr *saddr, - const struct in6_addr *daddr, - int proto, int len) +static void ip6_mc_hdr(const struct sock *sk, struct sk_buff *skb, + struct net_device *dev, const struct in6_addr *saddr, + const struct in6_addr *daddr, int proto, int len) { struct ipv6hdr *hdr; From patchwork Tue Jul 11 13:06:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guillaume Nault X-Patchwork-Id: 13308720 X-Patchwork-Delegate: kuba@kernel.org Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2728618C02 for ; Tue, 11 Jul 2023 13:06:40 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E1F18E5F for ; Tue, 11 Jul 2023 06:06:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689080794; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=nKlrculu500+hhy1U5AOcV+R3wyEM9d5epSI3K+C/wI=; b=SNCEW94GrjiXUJlunIBaSeaVYEPmonunqYRk2UfIVfNb5Fo9oT8LbUKIOA0/Up5o4TjBN8 sr0SiYcMzn0iN2MKfFVP5FKcIZ+g2wB7ahwTSDRe11eGyxqc3QzPBsyXGfbrQjQSq6rAoQ Xc2By2mGEfOEiZVUXSf/hqF9u/Yati0= Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-328-yB52GNoLNRa730DWq4v0GA-1; Tue, 11 Jul 2023 09:06:32 -0400 X-MC-Unique: yB52GNoLNRa730DWq4v0GA-1 Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-7677e58c1bfso749491585a.0 for ; Tue, 11 Jul 2023 06:06:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689080792; x=1691672792; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=nKlrculu500+hhy1U5AOcV+R3wyEM9d5epSI3K+C/wI=; b=J06rappNITen5peL7fxCWXc5FPMMs/XJ2+UCcfVPoyjgr8v03S6NH/QPudlN8PNsiU QuUWPTiaIgqJAyUF7MjrbdIpqtCnA6mW50qXGgoulhDtkN+WGi70LGtEyOMJraRu0hvl SIngjAD6GLCzuvbdNOLl+8uMSfCWbmRJ/QNGm2lB09flV5VGOCOPP1fz0tfd6cygAgaT F0ycjfJJmV81fT3wMsqfUt/IAtH5SSVC3onp2aHbtukwfpY/PBmFf2f7tfeEj30gpXKm 8Yr5QUKINZHckGdAF8paNWg+cBnWu3i+FW81gtyqY2uPJNT+xGHq7YS+Jdr3sWDOmljv 5nug== X-Gm-Message-State: ABy/qLaCGzxr66UJ8S74iZNgbUJyEQqYH0fnFobUo2yEldhVkgzfiHFm YF9xHdB3IQLZqk09zN+aE/wWFT4NHU51pS8zpjZYCrtBC1b8teS+XYvg1+X5aV/j1zNzQrqAMdZ mapKxMOpulWZGz748 X-Received: by 2002:a05:622a:282:b0:403:971a:44ab with SMTP id z2-20020a05622a028200b00403971a44abmr17125152qtw.58.1689080791688; Tue, 11 Jul 2023 06:06:31 -0700 (PDT) X-Google-Smtp-Source: APBJJlG6geKSzPbeKVKHlDVTBrbPQc0AUUpMjMzeYVNH2/7FBXJk4awgqKDePQbi8+NAGiB8ngcfIQ== X-Received: by 2002:a05:622a:282:b0:403:971a:44ab with SMTP id z2-20020a05622a028200b00403971a44abmr17125120qtw.58.1689080791315; Tue, 11 Jul 2023 06:06:31 -0700 (PDT) Received: from debian ([92.62.32.42]) by smtp.gmail.com with ESMTPSA id k1-20020ac80201000000b00403a06202c2sm1082885qtg.49.2023.07.11.06.06.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jul 2023 06:06:31 -0700 (PDT) Date: Tue, 11 Jul 2023 15:06:26 +0200 From: Guillaume Nault To: David Miller , Jakub Kicinski , Paolo Abeni , Eric Dumazet Cc: netdev@vger.kernel.org, Dmitry Kozlov Subject: [PATCH net-next 4/4] pptp: Constify the po parameter of pptp_route_output(). Message-ID: <6c74dc733dbb80f7b350c7184e4dac3694922e55.1689077819.git.gnault@redhat.com> References: Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net X-Patchwork-Delegate: kuba@kernel.org Make it explicit that this function doesn't modify the socket passed as parameter. Signed-off-by: Guillaume Nault Reviewed-by: Simon Horman --- drivers/net/ppp/pptp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ppp/pptp.c b/drivers/net/ppp/pptp.c index 32183f24e63f..57d38b27812d 100644 --- a/drivers/net/ppp/pptp.c +++ b/drivers/net/ppp/pptp.c @@ -129,10 +129,10 @@ static void del_chan(struct pppox_sock *sock) spin_unlock(&chan_lock); } -static struct rtable *pptp_route_output(struct pppox_sock *po, +static struct rtable *pptp_route_output(const struct pppox_sock *po, struct flowi4 *fl4) { - struct sock *sk = &po->sk; + const struct sock *sk = &po->sk; struct net *net; net = sock_net(sk);