--- /dev/null
+From lizefan@huawei.com Mon Jun 10 14:16:48 2013
+From: Li Zefan <lizefan@huawei.com>
+Date: Fri, 7 Jun 2013 17:01:04 +0800
+Subject: ftrace: Move ftrace_filter_lseek out of CONFIG_DYNAMIC_FTRACE section
+To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Cc: Namhyung Kim <namhyung@kernel.org>, Frederic Weisbecker <fweisbec@gmail.com>, Steven Rostedt <rostedt@goodmis.org>, Ingo Molnar <mingo@kernel.org>, LKML <linux-kernel@vger.kernel.org>, stable <stable@vger.kernel.org>
+Message-ID: <51B1A150.6030804@huawei.com>
+
+
+From: Steven Rostedt <rostedt@goodmis.org>
+
+commit 7f49ef69db6bbf756c0abca7e9b65b32e999eec8 upstream.
+
+As ftrace_filter_lseek is now used with ftrace_pid_fops, it needs to
+be moved out of the #ifdef CONFIG_DYNAMIC_FTRACE section as the
+ftrace_pid_fops is defined when DYNAMIC_FTRACE is not.
+
+Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
+Cc: Namhyung Kim <namhyung@kernel.org>
+[ lizf: adjust context ]
+Signed-off-by: Li Zefan <lizefan@huawei.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ kernel/trace/ftrace.c | 26 +++++++++++++-------------
+ 1 file changed, 13 insertions(+), 13 deletions(-)
+
+--- a/kernel/trace/ftrace.c
++++ b/kernel/trace/ftrace.c
+@@ -933,6 +933,19 @@ static __init void ftrace_profile_debugf
+
+ static struct pid * const ftrace_swapper_pid = &init_struct_pid;
+
++static loff_t
++ftrace_filter_lseek(struct file *file, loff_t offset, int whence)
++{
++ loff_t ret;
++
++ if (file->f_mode & FMODE_READ)
++ ret = seq_lseek(file, offset, whence);
++ else
++ file->f_pos = ret = 1;
++
++ return ret;
++}
++
+ #ifdef CONFIG_DYNAMIC_FTRACE
+
+ #ifndef CONFIG_FTRACE_MCOUNT_RECORD
+@@ -2299,19 +2312,6 @@ ftrace_notrace_open(struct inode *inode,
+ inode, file);
+ }
+
+-static loff_t
+-ftrace_filter_lseek(struct file *file, loff_t offset, int origin)
+-{
+- loff_t ret;
+-
+- if (file->f_mode & FMODE_READ)
+- ret = seq_lseek(file, offset, origin);
+- else
+- file->f_pos = ret = 1;
+-
+- return ret;
+-}
+-
+ static int ftrace_match(char *str, char *regex, int len, int type)
+ {
+ int matched = 0;
hwmon-adm1021-strengthen-chip-detection-for-adm1021-lm84-and-max1617.patch
drm-fix-a-use-after-free-when-gpu-acceleration-disabled.patch
drm-i915-sdvo-use-intel_sdvo-ddc-instead-of-intel_sdvo-i2c-for-ddc.patch
+usb-serial-ftdi_sio-handle-the-old_termios-0-case-e.g.-uart_resume_port.patch
+usb-ftdi_sio-quiet-sparse-noise-about-using-plain-integer-was-null-pointer.patch
+tracing-fix-possible-null-pointer-dereferences.patch
+ftrace-move-ftrace_filter_lseek-out-of-config_dynamic_ftrace-section.patch
--- /dev/null
+From lizefan@huawei.com Mon Jun 10 14:16:36 2013
+From: Li Zefan <lizefan@huawei.com>
+Date: Fri, 7 Jun 2013 17:00:33 +0800
+Subject: tracing: Fix possible NULL pointer dereferences
+To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Cc: Namhyung Kim <namhyung@kernel.org>, Frederic Weisbecker <fweisbec@gmail.com>, Steven Rostedt <rostedt@goodmis.org>, Ingo Molnar <mingo@kernel.org>, LKML <linux-kernel@vger.kernel.org>, stable <stable@vger.kernel.org>
+Message-ID: <51B1A131.9090206@huawei.com>
+
+
+From: Namhyung Kim <namhyung.kim@lge.com>
+
+commit 6a76f8c0ab19f215af2a3442870eeb5f0e81998d upstream.
+
+Currently set_ftrace_pid and set_graph_function files use seq_lseek
+for their fops. However seq_open() is called only for FMODE_READ in
+the fops->open() so that if an user tries to seek one of those file
+when she open it for writing, it sees NULL seq_file and then panic.
+
+It can be easily reproduced with following command:
+
+ $ cd /sys/kernel/debug/tracing
+ $ echo 1234 | sudo tee -a set_ftrace_pid
+
+In this example, GNU coreutils' tee opens the file with fopen(, "a")
+and then the fopen() internally calls lseek().
+
+Link:
+http://lkml.kernel.org/r/1365663302-2170-1-git-send-email-namhyung@kernel.org
+
+Signed-off-by: Namhyung Kim <namhyung@kernel.org>
+Cc: Frederic Weisbecker <fweisbec@gmail.com>
+Cc: Ingo Molnar <mingo@kernel.org>
+Cc: Namhyung Kim <namhyung.kim@lge.com>
+Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
+[ lizf: adjust context ]
+Signed-off-by: Li Zefan <lizefan@huawei.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ kernel/trace/ftrace.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+--- a/kernel/trace/ftrace.c
++++ b/kernel/trace/ftrace.c
+@@ -2300,7 +2300,7 @@ ftrace_notrace_open(struct inode *inode,
+ }
+
+ static loff_t
+-ftrace_regex_lseek(struct file *file, loff_t offset, int origin)
++ftrace_filter_lseek(struct file *file, loff_t offset, int origin)
+ {
+ loff_t ret;
+
+@@ -3118,7 +3118,7 @@ static const struct file_operations ftra
+ .open = ftrace_filter_open,
+ .read = seq_read,
+ .write = ftrace_filter_write,
+- .llseek = ftrace_regex_lseek,
++ .llseek = ftrace_filter_lseek,
+ .release = ftrace_regex_release,
+ };
+
+@@ -3126,7 +3126,7 @@ static const struct file_operations ftra
+ .open = ftrace_notrace_open,
+ .read = seq_read,
+ .write = ftrace_notrace_write,
+- .llseek = ftrace_regex_lseek,
++ .llseek = ftrace_filter_lseek,
+ .release = ftrace_regex_release,
+ };
+
+@@ -3335,8 +3335,8 @@ static const struct file_operations ftra
+ .open = ftrace_graph_open,
+ .read = seq_read,
+ .write = ftrace_graph_write,
++ .llseek = ftrace_filter_lseek,
+ .release = ftrace_graph_release,
+- .llseek = seq_lseek,
+ };
+ #endif /* CONFIG_FUNCTION_GRAPH_TRACER */
+
+@@ -3822,7 +3822,7 @@ static const struct file_operations ftra
+ .open = ftrace_pid_open,
+ .write = ftrace_pid_write,
+ .read = seq_read,
+- .llseek = seq_lseek,
++ .llseek = ftrace_filter_lseek,
+ .release = ftrace_pid_release,
+ };
+
--- /dev/null
+From a816e3113b63753c330ca4751ea1d208e93e3015 Mon Sep 17 00:00:00 2001
+From: Ying Xue <ying.xue@windriver.com>
+Date: Mon, 6 Aug 2012 17:46:37 +0800
+Subject: USB: ftdi_sio: Quiet sparse noise about using plain integer was NULL pointer
+
+From: Ying Xue <ying.xue@windriver.com>
+
+commit a816e3113b63753c330ca4751ea1d208e93e3015 upstream.
+
+Pointers should not be compared to plain integers.
+Quiets the sparse warning:
+warning: Using plain integer as NULL pointer
+
+Signed-off-by: Ying Xue <ying.xue@windriver.com>
+Cc: Lotfi Manseur <lotfi.manseur@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/usb/serial/ftdi_sio.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/usb/serial/ftdi_sio.c
++++ b/drivers/usb/serial/ftdi_sio.c
+@@ -2141,7 +2141,7 @@ static void ftdi_set_termios(struct tty_
+
+ cflag = termios->c_cflag;
+
+- if (old_termios == 0)
++ if (!old_termios)
+ goto no_skip;
+
+ if (old_termios->c_cflag == termios->c_cflag
--- /dev/null
+From c515598e0f5769916c31c00392cc2bfe6af74e55 Mon Sep 17 00:00:00 2001
+From: Andrew Worsley <amworsley@gmail.com>
+Date: Tue, 22 Nov 2011 20:00:19 +1100
+Subject: USB: serial: ftdi_sio: Handle the old_termios == 0 case e.g. uart_resume_port()
+
+From: Andrew Worsley <amworsley@gmail.com>
+
+commit c515598e0f5769916c31c00392cc2bfe6af74e55 upstream.
+
+ Handle null old_termios in ftdi_set_termios() calls from uart_resume_port().
+
+Signed-off-by: Andrew Worsley <amworsley@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+Cc: Lotfi Manseur <lotfi.manseur@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/usb/serial/ftdi_sio.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/drivers/usb/serial/ftdi_sio.c
++++ b/drivers/usb/serial/ftdi_sio.c
+@@ -2141,6 +2141,9 @@ static void ftdi_set_termios(struct tty_
+
+ cflag = termios->c_cflag;
+
++ if (old_termios == 0)
++ goto no_skip;
++
+ if (old_termios->c_cflag == termios->c_cflag
+ && old_termios->c_ispeed == termios->c_ispeed
+ && old_termios->c_ospeed == termios->c_ospeed)
+@@ -2154,6 +2157,7 @@ static void ftdi_set_termios(struct tty_
+ (termios->c_cflag & (CSIZE|PARODD|PARENB|CMSPAR|CSTOPB)))
+ goto no_data_parity_stop_changes;
+
++no_skip:
+ /* Set number of data bits, parity, stop bits */
+
+ urb_value = 0;
projects / thirdparty / kernel / stable-queue.git / commitdiff
