Re: [RFC] [PATCH x86 2/2] Cleanup do_int3

[Oleg Nesterov]

On 10/25, Srikar Dronamraju wrote:
>
> Since there is a possibility of !KPROBES int3 listeners and since
> DIE_TRAP is currently not being used by anybody, notify all listeners
> with DIE_INT3.

Obviously I can't ack this change, but it looks like the bugfix to me.

The current code uses DIE_INT3 or DIE_TRAP depending on CONFIG_KPROBES,
this can't be right.

> Signed-off-by: Ananth N Mavinakayanahalli <ananth@xxxxxxxxxx>
> Signed-off-by: Srikar Dronamraju <srikar@xxxxxxxxxxxxxxxxxx>
> ---
>  arch/x86/kernel/traps.c |    7 +------
>  1 files changed, 1 insertions(+), 6 deletions(-)
> 
> diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
> index 6913369..c9a4be5 100644
> --- a/arch/x86/kernel/traps.c
> +++ b/arch/x86/kernel/traps.c
> @@ -461,15 +461,10 @@ dotraplinkage void __kprobes do_int3(struct pt_regs *regs, long error_code)
>  			== NOTIFY_STOP)
>  		return;
>  #endif /* CONFIG_KGDB_LOW_LEVEL_TRAP */
> -#ifdef CONFIG_KPROBES
> +
>  	if (notify_die(DIE_INT3, "int3", regs, error_code, 3, SIGTRAP)
>  			== NOTIFY_STOP)
>  		return;
> -#else
> -	if (notify_die(DIE_TRAP, "int3", regs, error_code, 3, SIGTRAP)
> -			== NOTIFY_STOP)
> -		return;
> -#endif
>  
>  	preempt_conditional_sti(regs);
>  	do_trap(3, SIGTRAP, "int3", regs, error_code, NULL);
> 

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