Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Tue, 29 Sep 2020 08:52:47 +0200
From:   Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To:     Masami Hiramatsu <mhiramat@kernel.org>
Cc:     Steven Rostedt <rostedt@goodmis.org>,
        Naresh Kamboju <naresh.kamboju@linaro.org>,
        open list <linux-kernel@vger.kernel.org>,
        linux- stable <stable@vger.kernel.org>,
        Muchun Song <songmuchun@bytedance.com>,
        Chengming Zhou <zhouchengming@bytedance.com>
Subject: Re: [PATCH 4.19 38/92] kprobes: Fix NULL pointer dereference at
 kprobe_ftrace_handler
Message-ID: <20200929065247.GB2439787@kroah.com>
References: <20200820091537.490965042@linuxfoundation.org>
 <20200820091539.592290034@linuxfoundation.org>
 <CA+G9fYvdQv2Ukvs-UKiEgYaDdBthsWsY=35cQ4YpvMhA0hU5Gg@mail.gmail.com>
 <20200928180942.100aa6c8@oasis.local.home>
 <20200928181535.56d7b2cb@oasis.local.home>
 <20200929144954.56090c5eeb5a36e1f552b315@kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <20200929144954.56090c5eeb5a36e1f552b315@kernel.org>
Precedence: bulk

On Tue, Sep 29, 2020 at 02:49:54PM +0900, Masami Hiramatsu wrote:
> Hi,
> 
> On Mon, 28 Sep 2020 18:15:35 -0400
> Steven Rostedt <rostedt@goodmis.org> wrote:
> 
> > On Mon, 28 Sep 2020 18:09:42 -0400
> > Steven Rostedt <rostedt@goodmis.org> wrote:
> > 
> > > On Tue, 29 Sep 2020 01:32:59 +0530
> > > Naresh Kamboju <naresh.kamboju@linaro.org> wrote:
> > > 
> > > > stable rc branch 4.19 build warning on arm64.
> > > > 
> > > > ../kernel/kprobes.c: In function ‘kill_kprobe’:
> > > > ../kernel/kprobes.c:1070:33: warning: statement with no effect [-Wunused-value]
> > > >  1070 | #define disarm_kprobe_ftrace(p) (-ENODEV)
> > > >       |                                 ^
> > > > ../kernel/kprobes.c:2090:3: note: in expansion of macro ‘disarm_kprobe_ftrace’
> > > >  2090 |   disarm_kprobe_ftrace(p);
> > > >       |   ^~~~~~~~~~~~~~~~~~~~  
> > > 
> > > Seems to affect upstream as well.
> > > 
> > 
> > Bah, no (tested the wrong kernel).
> > 
> > You want this commit too:
> > 
> > 10de795a5addd ("kprobes: Fix compiler warning for !CONFIG_KPROBES_ON_FTRACE")
> 
> It seems that this commit's Fixes tag is wrong.
> 
> ae6aa16fdc163 (Masami Hiramatsu           2012-06-05 19:28:32 +0900 1079) #define prepare_kprobe(p)     arch_prepare_kprobe(p)
> 12310e3437554 (Jessica Yu                 2018-01-10 00:51:23 +0100 1080) #define arm_kprobe_ftrace(p)  (-ENODEV)
> 297f9233b53a0 (Jessica Yu                 2018-01-10 00:51:24 +0100 1081) #define disarm_kprobe_ftrace(p)       (-ENODEV)
> 
> Thus, it should have "Fixes: 297f9233b53a ("kprobes: Propagate error from disarm_kprobe_ftrace()")"
> 
> $ git tag -l --contains 297f9233b53a | grep "^v[[:digit:].]*$" | cut -f1-2 -d. | uniq
> v4.16
> v4.17
> v4.18
> v4.19
> v4.20
> v5.0
> v5.1
> v5.2
> v5.3
> v5.4
> v5.5
> v5.6
> v5.7
> v5.8
> 
> So the commit 10de795a5addd must be backported to 4.19.y and 5.4.y.

Now queued up, thanks.

greg k-h