linux-kernel - Re: [PATCH] ftrace: fix debug config symbol in stack_tracer

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] [day] [month] [year] [list]

Message-ID: <20170831154036.4xldyakmmhuts5x7@hatter.bewilderbeest.net>
Date:   Thu, 31 Aug 2017 10:40:36 -0500
From:   Zev Weiss <zev@...ilderbeest.net>
To:     Steven Rostedt <rostedt@...dmis.org>
Cc:     Ingo Molnar <mingo@...hat.com>, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] ftrace: fix debug config symbol in
 stack_tracer_{en,dis}able

On Thu, Aug 31, 2017 at 08:54:07AM CDT, Steven Rostedt wrote:
>On Thu, 31 Aug 2017 02:01:08 -0500
>Zev Weiss <zev@...ilderbeest.net> wrote:
>
>> Hello,
>>
>> It appears stack_tracer_disable()/stack_tracer_enable() have been
>> using the wrong name for the config symbol to enable their
>> preempt-debugging checks, which the patch below should fix.  (Noticed
>> when I made the same mistake attempting to grep for
>> CONFIG_DEBUG_PREEMPT and got two results instead of zero).
>>
>>
>> Zev Weiss
>
>Can you resend with a proper change log (no "Hello") and add a
>Signed-off-by tag?
>
>Thanks!
>
>-- Steve
>

Ah, sorry about that -- misunderstood what my 'git send-email' flags 
were doing...hopefully the below works better.


Zev

>From e916675c65ffcfb953f79c7243e8508efcf13aeb Mon Sep 17 00:00:00 2001
From: Zev Weiss <zev@...ilderbeest.net>
Date: Wed, 30 Aug 2017 05:36:38 -0500
Subject: [PATCH] ftrace: fix debug config symbol in stack_tracer_{en,dis}able

stack_tracer_disable()/stack_tracer_enable() had been using the wrong
name for the config symbol to enable their preempt-debugging checks --
fix with a word swap.

Signed-off-by: Zev Weiss <zev@...ilderbeest.net>
---
 include/linux/ftrace.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
index 6383115e9d2c..2e028854bac7 100644
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
@@ -307,7 +307,7 @@ DECLARE_PER_CPU(int, disable_stack_tracer);
 static inline void stack_tracer_disable(void)
 {
 	/* Preemption or interupts must be disabled */
-	if (IS_ENABLED(CONFIG_PREEMPT_DEBUG))
+	if (IS_ENABLED(CONFIG_DEBUG_PREEMPT))
 		WARN_ON_ONCE(!preempt_count() || !irqs_disabled());
 	this_cpu_inc(disable_stack_tracer);
 }
@@ -320,7 +320,7 @@ static inline void stack_tracer_disable(void)
  */
 static inline void stack_tracer_enable(void)
 {
-	if (IS_ENABLED(CONFIG_PREEMPT_DEBUG))
+	if (IS_ENABLED(CONFIG_DEBUG_PREEMPT))
 		WARN_ON_ONCE(!preempt_count() || !irqs_disabled());
 	this_cpu_dec(disable_stack_tracer);
 }
-- 
2.14.1