mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Vincent Whitchurch <Vincent.Whitchurch@axis.com>
To: "edumazet@google.com" <edumazet@google.com>,
	"viro@zeniv.linux.org.uk" <viro@zeniv.linux.org.uk>
Cc: "davem@davemloft.net" <davem@davemloft.net>,
	"dave.hansen@linux.intel.com" <dave.hansen@linux.intel.com>,
	"x86@kernel.org" <x86@kernel.org>,
	"dsahern@kernel.org" <dsahern@kernel.org>,
	"bp@alien8.de" <bp@alien8.de>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	"tglx@linutronix.de" <tglx@linutronix.de>,
	"gus@keba.com" <gus@keba.com>,
	"mingo@redhat.com" <mingo@redhat.com>,
	"kuba@kernel.org" <kuba@kernel.org>,
	"viro@ftp.linux.org.uk" <viro@ftp.linux.org.uk>,
	"linux-arm-kernel@lists.infradead.org" 
	<linux-arm-kernel@lists.infradead.org>,
	"pabeni@redhat.com" <pabeni@redhat.com>
Subject: Re: AW: [PATCH] amd64: Fix csum_partial_copy_generic()
Date: Fri, 20 Oct 2023 08:32:59 +0000	[thread overview]
Message-ID: <44b4e841067034f937f80869f967c7882d162452.camel@axis.com> (raw)
In-Reply-To: <20231019080615.GY800259@ZenIV>

On Thu, 2023-10-19 at 09:06 +0100, Al Viro wrote:
> diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
> index b8607763d113..6da09157f722 100644
> --- a/net/ipv4/icmp.c
> +++ b/net/ipv4/icmp.c
> @@ -376,6 +376,7 @@ static void icmp_push_reply(struct sock *sk,
>  	} else if ((skb = skb_peek(&sk->sk_write_queue)) != NULL) {
>  		struct icmphdr *icmph = icmp_hdr(skb);
>  		__wsum csum;
> +		__sum16 folded;
>  		struct sk_buff *skb1;
>  
> 
>  		csum = csum_partial_copy_nocheck((void *)&icmp_param->data,
> @@ -384,7 +385,8 @@ static void icmp_push_reply(struct sock *sk,
>  		skb_queue_walk(&sk->sk_write_queue, skb1) {
>  			csum = csum_add(csum, skb1->csum);
>  		}
> -		icmph->checksum = csum_fold(csum);
> +		folded = csum_fold(csum);
> +		icmph->checksum = folded ? folded : CSUM_MANGLED_0;
>  		skb->ip_summed = CHECKSUM_NONE;
>  		ip_push_pending_frames(sk, fl4);
>  	}

32-bit ARM is also affected since commit 1d60be3c25edf4b95 ("arm:
propagate the calling convention changes down to
csum_partial_copy_from_user()").

While the above fixes the ICMP reply case, are there other callers that
also need similar changes?  For example, I see net/sched/act_csum.c also
calculating ICMP checksums?


  reply	other threads:[~2023-10-20  8:33 UTC|newest]

Thread overview: 66+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-18  6:18 gus Gusenleitner Klaus
2023-10-18  7:36 ` Eric Dumazet
2023-10-18 15:12   ` Thomas Gleixner
2023-10-18 15:42 ` Al Viro
2023-10-18 17:37   ` Thomas Gleixner
2023-10-19  4:44   ` AW: " gus Gusenleitner Klaus
2023-10-19  5:02     ` Al Viro
2023-10-19  6:14       ` Al Viro
2023-10-19  6:39         ` Al Viro
2023-10-19  7:39           ` Eric Dumazet
2023-10-19  8:06             ` Al Viro
2023-10-20  8:32               ` Vincent Whitchurch [this message]
2023-10-20 20:27               ` David Laight
2023-10-21  7:15               ` Al Viro
2023-10-21 22:22                 ` Al Viro
2023-10-22 11:03                   ` David Laight
2023-10-22 11:11                     ` Al Viro
2023-10-23  8:16                       ` David Laight
2023-10-24  2:59                         ` Al Viro
2023-10-22 19:40                   ` [RFC][PATCH] fix csum_and_copy_..._user() idiocy. " Al Viro
2023-10-22 19:46                     ` Al Viro
2023-10-23 10:37                       ` Thomas Gleixner
2023-10-24  4:26                         ` Al Viro
2023-10-24 12:31                           ` Thomas Gleixner
2023-10-23 14:44                     ` David Laight
2023-10-24  3:53                       ` Al Viro
2023-12-05  2:21                     ` [RFC][PATCHES v2] checksum stuff Al Viro
2023-12-05  2:23                       ` [PATCH v2 01/18] make net/checksum.h self-contained Al Viro
2023-12-05  2:23                         ` [PATCH v2 1/9] reiserfs: Avoid touching renamed directory if parent does not change Al Viro
2023-12-05  2:23                         ` [PATCH v2 02/18] get rid of asm/checksum.h includes outside of include/net/checksum.h and arch Al Viro
2023-12-05  2:23                         ` [PATCH v2 2/9] ocfs2: Avoid touching renamed directory if parent does not change Al Viro
2023-12-05  2:23                         ` [PATCH v2 03/18] make net/checksum.h the sole user of asm/checksum.h Al Viro
2023-12-05  2:23                         ` [PATCH v2 3/9] udf_rename(): only access the child content on cross-directory rename Al Viro
2023-12-05  2:23                         ` [PATCH v2 4/9] ext2: Avoid reading renamed directory if parent does not change Al Viro
2023-12-05  2:23                         ` [PATCH v2 04/18] Fix the csum_and_copy_..._user() idiocy Al Viro
2023-12-05  2:24                         ` [PATCH v2 05/18] bits missing from csum_and_copy_{from,to}_user() unexporting Al Viro
2023-12-05  2:24                         ` [PATCH v2 5/9] ext4: don't access the source subdirectory content on same-directory rename Al Viro
2023-12-05  2:24                         ` [PATCH v2 06/18] consolidate csum_tcpudp_magic(), take default variant into net/checksum.h Al Viro
2023-12-05  2:24                         ` [PATCH v2 6/9] f2fs: Avoid reading renamed directory if parent does not change Al Viro
2023-12-05  2:24                         ` [PATCH v2 07/18] consolidate default ip_compute_csum() Al Viro
2023-12-05  2:24                         ` [PATCH v2 7/9] rename(): fix the locking of subdirectories Al Viro
2023-12-05  2:24                         ` [PATCH v2 08/18] alpha: pull asm-generic/checksum.h Al Viro
2023-12-05  2:24                         ` [PATCH v2 8/9] kill lock_two_inodes() Al Viro
2023-12-05  2:24                         ` [PATCH v2 09/18] mips: pull include of asm-generic/checksum.h out of #if Al Viro
2023-12-05  2:24                         ` [PATCH v2 9/9] rename(): avoid a deadlock in the case of parents having no common ancestor Al Viro
2023-12-05  2:24                         ` [PATCH v2 10/18] nios2: pull asm-generic/checksum.h Al Viro
2023-12-05  2:24                         ` [PATCH v2 11/18] x86: merge csum_fold() for 32bit and 64bit Al Viro
2023-12-05  2:24                         ` [PATCH v2 12/18] x86: merge ip_fast_csum() " Al Viro
2023-12-05  2:24                         ` [PATCH v2 13/18] x86: merge csum_tcpudp_nofold() " Al Viro
2023-12-05  2:24                         ` [PATCH v2 14/18] amd64: saner handling of odd address in csum_partial() Al Viro
2023-12-05  2:24                         ` [PATCH v2 15/18] x86: optimized csum_add() is the same for 32bit and 64bit Al Viro
2023-12-05  2:24                         ` [PATCH v2 16/18] x86: lift the extern for csum_partial() into checksum.h Al Viro
2023-12-05  2:24                         ` [PATCH v2 17/18] x86_64: move csum_ipv6_magic() from csum-wrappers_64.c to csum-partial_64.c Al Viro
2023-12-05  2:24                         ` [PATCH v2 18/18] uml/x86: use normal x86 checksum.h Al Viro
2024-01-03 22:02                           ` Richard Weinberger
2023-12-05  2:27                       ` [RFC][PATCHES v2] checksum stuff Al Viro
2023-12-06 11:10                       ` David Laight
2023-12-06 22:43                         ` Al Viro
2023-12-07  9:58                           ` David Laight
2023-12-08 12:04                           ` David Laight
2023-12-08 14:17                             ` Al Viro
2023-12-08 15:29                               ` Al Viro
2023-12-08 15:56                               ` David Laight
2023-12-08 18:35                                 ` Al Viro
2023-10-19 11:45           ` AW: [PATCH] amd64: Fix csum_partial_copy_generic() Thomas Gleixner
2023-10-19 10:33     ` David Laight

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=44b4e841067034f937f80869f967c7882d162452.camel@axis.com \
    --to=vincent.whitchurch@axis.com \
    --cc=bp@alien8.de \
    --cc=dave.hansen@linux.intel.com \
    --cc=davem@davemloft.net \
    --cc=dsahern@kernel.org \
    --cc=edumazet@google.com \
    --cc=gus@keba.com \
    --cc=kuba@kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=pabeni@redhat.com \
    --cc=tglx@linutronix.de \
    --cc=viro@ftp.linux.org.uk \
    --cc=viro@zeniv.linux.org.uk \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®