Linux 3.4.33
Greg KH
maintainerI'm announcing the release of the 3.4.33 kernel.
All users of the 3.4 kernel series must upgrade.
The updated 3.4.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.4.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 +- include/linux/syslog.h | 6 ++++++ kernel/printk.c | 13 ++++++++++++- 3 files changed, 19 insertions(+), 2 deletions(-)
Alexandre SIMON (1):
printk: fix buffer overflow when calling log_prefix function from call_console_drivers
Greg Kroah-Hartman (1):
3.4.33
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 4 -SUBLEVEL = 32 +SUBLEVEL = 33 EXTRAVERSION = NAME = Saber-toothed Squirrel
include/linux/syslog.h +6 -0
@@ -47,6 +47,12 @@#define SYSLOG_FROM_CALL 0#define SYSLOG_FROM_FILE 1 +/* +* Syslog priority (PRI) maximum length in char : '<[0-9]{1,3}>' +* See RFC5424 for details +*/ +#define SYSLOG_PRI_MAX_LENGTH 5 +int do_syslog (int type,char __user *buf,int count,bool from_file);#endif /* _LINUX_SYSLOG_H */
kernel/printk.c +12 -1
@@ -638,8 +638,19 @@ static void call_console_drivers(unsigned start, unsigned end) start_print = start;while (cur_index != end) {if (msg_level <0 && ((end - cur_index) >2 )) { +/* +* prepare buf_prefix, as a contiguous array, +* to be processed by log_prefix function +*/ +char buf_prefix[SYSLOG_PRI_MAX_LENGTH +1 ]; +unsigned i; +for (i =0 ; i < ((end - cur_index)) && (i <SYSLOG_PRI_MAX_LENGTH ); i++) { + buf_prefix[i] =LOG_BUF (cur_index + i); + } + buf_prefix[i] ='\0' ;/* force '\0' as last string character */ +/* strip log prefix */ - cur_index +=log_prefix (&LOG_BUF (cur_index), &msg_level,NULL ); + cur_index +=log_prefix ((const char *)&buf_prefix, &msg_level,NULL ); start_print = cur_index; }while (cur_index != end) {