netdev - Re: [net v2] tcp: Explicitly mark reserved field in tcp_zerocopy

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20210206092041.77eb5455@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com>
Date:   Sat, 6 Feb 2021 09:20:41 -0800
From:   Jakub Kicinski <kuba@...nel.org>
To:     Arjun Roy <arjunroy.kdev@...il.com>
Cc:     davem@...emloft.net, netdev@...r.kernel.org, arjunroy@...gle.com,
        edumazet@...gle.com, soheil@...gle.com,
        David Ahern <dsahern@...il.com>,
        Leon Romanovsky <leon@...nel.org>
Subject: Re: [net v2] tcp: Explicitly mark reserved field in
 tcp_zerocopy_receive args.

On Sat, 6 Feb 2021 09:19:03 -0800 Jakub Kicinski wrote:
> On Fri,  5 Feb 2021 23:02:03 -0800 Arjun Roy wrote:
> > From: Arjun Roy <arjunroy@...gle.com>
> > 
> > Explicitly define reserved field and require it to be 0-valued.
> > 
> > Fixes: 7eeba1706eba ("tcp: Add receive timestamp support for receive zerocopy.")
> > Signed-off-by: Arjun Roy <arjunroy@...gle.com>
> > Signed-off-by: Eric Dumazet <edumazet@...gle.com>
> > Signed-off-by: Soheil Hassas Yeganeh <soheil@...gle.com>
> > Suggested-by: David Ahern <dsahern@...il.com>
> > Suggested-by: Leon Romanovsky <leon@...nel.org>
> > Suggested-by: Jakub Kicinski <kuba@...nel.org>  
> 
> Applying: tcp: Explicitly mark reserved field in tcp_zerocopy_receive args.
> Using index info to reconstruct a base tree...
> M	include/uapi/linux/tcp.h
> M	net/ipv4/tcp.c
> Falling back to patching base and 3-way merge...
> Auto-merging net/ipv4/tcp.c
> Auto-merging include/uapi/linux/tcp.h
> CONFLICT (content): Merge conflict in include/uapi/linux/tcp.h
> error: Failed to merge in the changes.
> hint: Use 'git am --show-current-patch=diff' to see the failed patch
> Patch failed at 0001 tcp: Explicitly mark reserved field in tcp_zerocopy_receive args.
> When you have resolved this problem, run "git am --continue".
> If you prefer to skip this patch, run "git am --skip" instead.
> To restore the original branch and stop patching, run "git am --abort".

Ah, you just marked it for the wrong tree. Please repost with net-next
in the subject tag, otherwise build bot won't handle it.