From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
David Miller <davem@davemloft•net>,
Networking <netdev@vger•kernel.org>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Yonghong Song <yhs@fb•com>, Alexei Starovoitov <ast@kernel•org>
Subject: Re: linux-next: manual merge of the akpm tree with the net-next tree
Date: Tue, 2 Jun 2020 19:45:17 +1000 [thread overview]
Message-ID: <20200602194517.18b5db39@canb.auug.org.au> (raw)
In-Reply-To: <20200602193048.6ab63e72@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1787 bytes --]
Hi all,
On Tue, 2 Jun 2020 19:30:48 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the akpm tree got a conflict in:
>
> kernel/trace/bpf_trace.c
>
> between commit:
>
> b36e62eb8521 ("bpf: Use strncpy_from_unsafe_strict() in bpf_seq_printf() helper")
>
> from the net-next tree and patch:
>
> "bpf:bpf_seq_printf(): handle potentially unsafe format string better"
>
> from the akpm tree.
>
> I fixed it up (I just dropped the akpm tree patch (and its fix) for now)
> and can carry the fix as necessary. This is now fixed as far as linux-next
> is concerned, but any non trivial conflicts should be mentioned to your
> upstream maintainer when your tree is submitted for merging. You may
> also want to consider cooperating with the maintainer of the conflicting
> tree to minimise any particularly complex conflicts.
I also had to ad the below patch:
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Tue, 2 Jun 2020 19:40:42 +1000
Subject: [PATCH] fix up for strncpy_from_unsafe_strict rename
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
kernel/trace/bpf_trace.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c
index af4bca8343ad..0d88e9b24928 100644
--- a/kernel/trace/bpf_trace.c
+++ b/kernel/trace/bpf_trace.c
@@ -619,7 +619,7 @@ BPF_CALL_5(bpf_seq_printf, struct seq_file *, m, char *, fmt, u32, fmt_size,
goto out;
}
- err = strncpy_from_unsafe_strict(bufs->buf[memcpy_cnt],
+ err = strncpy_from_kernel_nofault(bufs->buf[memcpy_cnt],
(void *) (long) args[fmt_cnt],
MAX_SEQ_PRINTF_STR_LEN);
if (err < 0)
--
2.26.2
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2020-06-02 9:45 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-02 9:30 linux-next: manual merge of the akpm tree with the net-next tree Stephen Rothwell
2020-06-02 9:45 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-07-03 10:49 Stephen Rothwell
2018-01-16 4:51 Stephen Rothwell
2017-03-20 5:10 Stephen Rothwell
2017-02-07 5:23 Stephen Rothwell
2017-02-07 8:40 ` Marc Kleine-Budde
2017-02-07 9:45 ` Stephen Rothwell
2015-05-14 7:39 Stephen Rothwell
2015-05-14 7:38 Stephen Rothwell
2014-07-23 8:18 Stephen Rothwell
2013-11-06 9:00 Stephen Rothwell
2013-11-06 8:55 Stephen Rothwell
2013-05-21 4:32 Stephen Rothwell
2013-05-21 4:29 Stephen Rothwell
2013-05-21 20:04 ` Andrew Morton
2013-05-22 7:07 ` David Miller
2013-05-22 7:14 ` Andrew Morton
2013-05-22 7:19 ` David Miller
2013-05-22 7:48 ` Daniel Borkmann
2013-05-21 4:25 Stephen Rothwell
2013-05-21 7:44 ` Daniel Borkmann
2013-05-21 23:54 ` Stephen Rothwell
2013-05-22 9:20 ` Daniel Borkmann
2013-05-20 4:14 Stephen Rothwell
2013-05-20 4:11 Stephen Rothwell
2013-02-20 6:02 Stephen Rothwell
2013-02-20 6:43 ` Cong Wang
2013-02-15 6:56 Stephen Rothwell
2012-06-08 3:56 Stephen Rothwell
2011-11-23 3:27 Stephen Rothwell
2011-11-23 3:40 ` Neil Horman
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=20200602194517.18b5db39@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=ast@kernel$(echo .)org \
--cc=davem@davemloft$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=yhs@fb$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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