| 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
| ||
|
Message-ID: <51E7A7D6.8090900@huawei.com> Date: Thu, 18 Jul 2013 16:31:18 +0800 From: "zhangwei(Jovi)" <jovi.zhangwei@...wei.com> To: Steven Rostedt <rostedt@...dmis.org> CC: Frederic Weisbecker <fweisbec@...il.com>, Ingo Molnar <mingo@...hat.com>, "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org> Subject: [PATCH 2/3] tracing: add TRACE_ITER_PRINTK flag check in __trace_puts/__trace_bputs There missed TRACE_ITER_PRINTK check in __trace_puts/__trace_bputs, so add it, to constant with __trace_printk/__trace_bprintk, those functions mainly called by same function: trace_printk. Signed-off-by: zhangwei(Jovi) <jovi.zhangwei@...wei.com> --- kernel/trace/trace.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 4d70cc5..41340c3 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -365,6 +365,9 @@ int __trace_puts(unsigned long ip, const char *str, int size) int alloc; int pc; + if (!(trace_flags & TRACE_ITER_PRINTK)) + return 0; + pc = preempt_count(); alloc = sizeof(*entry) + size + 2; /* possible \n added */ @@ -409,6 +412,9 @@ int __trace_bputs(unsigned long ip, const char *str) int size = sizeof(struct bputs_entry); int pc; + if (!(trace_flags & TRACE_ITER_PRINTK)) + return 0; + pc = preempt_count(); local_save_flags(irq_flags); -- 1.7.9.7 -- 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/
Powered by blists - more mailing lists