netdev - Re: [PATCH net v2 0/2] mptcp: Prevent tcp_push() crash and selftest temp file buildup

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: <20210901101613.50a11581@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com>
Date:   Wed, 1 Sep 2021 10:16:13 -0700
From:   Jakub Kicinski <kuba@...nel.org>
To:     Matthieu Baerts <matthieu.baerts@...sares.net>
Cc:     "David S. Miller" <davem@...emloft.net>, mptcp@...ts.linux.dev,
        Mat Martineau <mathew.j.martineau@...ux.intel.com>,
        netdev@...r.kernel.org, Paolo Abeni <pabeni@...hat.com>
Subject: Re: [PATCH net v2 0/2] mptcp: Prevent tcp_push() crash and selftest
 temp file buildup

On Wed, 1 Sep 2021 18:09:52 +0200 Matthieu Baerts wrote:
> Hi David, Jakub,
> 
> On 31/08/2021 19:19, Mat Martineau wrote:
> > These are two fixes for the net tree, addressing separate issues.
> > 
> > Patch 1 addresses a divide-by-zero crash seen in syzkaller and also
> > reported by a user on the netdev list. This changes MPTCP code so
> > tcp_push() cannot be called with an invalid (0) mss_now value.
> > 
> > Patch 2 fixes a selftest temp file cleanup issue that consumes excessive
> > disk space when running repeated tests.
> > 
> > 
> > v2: Make suggested changes to lockdep check and indentation in patch 1  
> 
> We recently noticed this series has been marked as "Not Applicable" on
> Patchwork.
> 
> It looks like we can apply these patches:
> 
>   $ git checkout netdev-net/master # 780aa1209f88
>   $ git-pw series apply 539963
>   Applying: mptcp: fix possible divide by zero
>   Using index info to reconstruct a base tree...
>   M       net/mptcp/protocol.c
> 
>   Falling back to patching base and 3-way merge...
>   Auto-merging net/mptcp/protocol.c
> 
>   Applying: selftests: mptcp: clean tmp files in simult_flows
> 
> Git auto-resolves conflicts. Is it why it is considered as "Not
> Applicable" or did we miss something else?

We don't enable 3-way merges for patches applied from the list, usually.

> Do we just need to resend these patches after a rebase?

Yes please.