hw_breakpoints, powerpc: Fix CONFIG_HAVE_HW_BREAKPOINT off-case in ptrace_set_debugreg() (925f83c0) · Commits · 戴 / test

We make use of ptrace_get_breakpoints() / ptrace_put_breakpoints() to protect ptrace_set_debugreg() even if CONFIG_HAVE_HW_BREAKPOINT if off. However in this case, these APIs are not implemented. To fix this, push the protection down inside the relevant ifdef. Best would be to export the code inside CONFIG_HAVE_HW_BREAKPOINT into a standalone function to cleanup the ifdefury there and call the breakpoint ref API inside. But as it is more invasive, this should be rather made in an -rc1. Fixes this build error: arch/powerpc/kernel/ptrace.c:1594: error: implicit declaration of function 'ptrace_get_breakpoints' make[2]: *** Reported-by:

Ingo Molnar <mingo@elte.hu> Signed-off-by:

Frederic Weisbecker <fweisbec@gmail.com> Cc: LPPC <linuxppc-dev@lists.ozlabs.org> Cc: Prasad <prasad@linux.vnet.ibm.com> Cc: v2.6.33.. <stable@kernel.org> Link: http://lkml.kernel.org/r/1304639598-4707-1-git-send-email-fweisbec@gmail.com Signed-off-by:

Ingo Molnar <mingo@elte.hu>

arch/powerpc/kernel/ptrace.c

+11 −4

Original line number	Diff line number	Diff line
		@@ -933,12 +933,16 @@ int ptrace_set_debugreg(struct task_struct *task, unsigned long addr,
		if (data && !(data & DABR_TRANSLATION))
		return -EIO;
		#ifdef CONFIG_HAVE_HW_BREAKPOINT
		if (ptrace_get_breakpoints(task) < 0)
		return -ESRCH;

		bp = thread->ptrace_bps[0];
		if ((!data) \|\| !(data & (DABR_DATA_WRITE \| DABR_DATA_READ))) {
		if (bp) {
		unregister_hw_breakpoint(bp);
		thread->ptrace_bps[0] = NULL;
		}
		ptrace_put_breakpoints(task);
		return 0;
		}
		if (bp) {
		@@ -948,9 +952,12 @@ int ptrace_set_debugreg(struct task_struct *task, unsigned long addr,
		(DABR_DATA_WRITE \| DABR_DATA_READ),
		&attr.bp_type);
		ret = modify_user_hw_breakpoint(bp, &attr);
		if (ret)
		if (ret) {
		ptrace_put_breakpoints(task);
		return ret;
		}
		thread->ptrace_bps[0] = bp;
		ptrace_put_breakpoints(task);
		thread->dabr = data;
		return 0;
		}
		@@ -965,9 +972,12 @@ int ptrace_set_debugreg(struct task_struct *task, unsigned long addr,
		ptrace_triggered, task);
		if (IS_ERR(bp)) {
		thread->ptrace_bps[0] = NULL;
		ptrace_put_breakpoints(task);
		return PTR_ERR(bp);
		}

		ptrace_put_breakpoints(task);

		#endif /* CONFIG_HAVE_HW_BREAKPOINT */

		/* Move contents to the DABR register */
		@@ -1591,10 +1601,7 @@ long arch_ptrace(struct task_struct *child, long request,
		}

		case PTRACE_SET_DEBUGREG:
		if (ptrace_get_breakpoints(child) < 0)
		return -ESRCH;
		ret = ptrace_set_debugreg(child, addr, data);
		ptrace_put_breakpoints(child);
		break;

		#ifdef CONFIG_PPC64

Admin message