linux-kernel - Re: [PATCH 0/4] ftrace: prevent ftrace modifications while being kprobe'd

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: <863e9df20806232029x6621ff13qd584591214e93d7f@mail.gmail.com>
Date:	Tue, 24 Jun 2008 08:59:34 +0530
From:	"Abhishek Sagar" <sagar.abhishek@...il.com>
To:	"Ingo Molnar" <mingo@...e.hu>
Cc:	"Steven Rostedt" <rostedt@...dmis.org>,
	"Thomas Gleixner" <tglx@...utronix.de>,
	LKML <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH 0/4] ftrace: prevent ftrace modifications while being kprobe'd

Hi Ingo,

On Tue, Jun 24, 2008 at 1:45 AM, Ingo Molnar <mingo@...e.hu> wrote:
> note that i had to do a number of fixups to themerge, and there was one
> chunk which did not merge cleanly and i left it out for now:
>
> @@ -435,8 +502,12 @@ static void ftrace_replace_code(int enable)
>                                continue;
>
>                        /* ignore updates to this record's mcount site */
> -                       if (get_kprobe((void *)rec->ip))
> +                       if (get_kprobe((void *)rec->ip)) {
> +                               freeze_record(rec);
>                                continue;
> +                       } else {
> +                               unfreeze_record(rec);
> +                       }

I wonder why it conflicted during the merge. I notice that patch 4/4
has been applied before
3/4. Can you try reversing the order and see if it works? Else I'll redo them.

--
Thanks,
Abhishek Sagar
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/