Commit a0a4e00a authored by Sumit Garg's avatar Sumit Garg Committed by Greg Kroah-Hartman
Browse files

kdb: Make memory allocations more robust 



commit 93f7a6d8 upstream.

Currently kdb uses in_interrupt() to determine whether its library
code has been called from the kgdb trap handler or from a saner calling
context such as driver init. This approach is broken because
in_interrupt() alone isn't able to determine kgdb trap handler entry from
normal task context. This can happen during normal use of basic features
such as breakpoints and can also be trivially reproduced using:
echo g > /proc/sysrq-trigger

We can improve this by adding check for in_dbg_master() instead which
explicitly determines if we are running in debugger context.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarSumit Garg <sumit.garg@linaro.org>
Link: https://lore.kernel.org/r/1611313556-4004-1-git-send-email-sumit.garg@linaro.org


Signed-off-by: default avatarDaniel Thompson <daniel.thompson@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4eb9d709

kernel/debug/kdb/kdb_private.h

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ extern struct task_struct *kdb_curr_task(int); 
#define	kdb_do_each_thread(g, p) do_each_thread(g, p)

#define	kdb_while_each_thread(g, p) while_each_thread(g, p)



#define GFP_KDB (in_interrupt() ? GFP_ATOMIC : GFP_KERNEL)

#define GFP_KDB (in_dbg_master() ? GFP_ATOMIC : GFP_KERNEL)



extern void *debug_kmalloc(size_t size, gfp_t flags);

extern void debug_kfree(void *);