p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

serial: sh-sci: Uninitialized variables in sysfs files 

The kstrtol() function returns -ERANGE as well as -EINVAL so these tests
are not enough.  It's not a super serious bug, but my static checker
correctly complains that the "r" variable might be used uninitialized.

Fixes: 5d23188a47 ("serial: sh-sci: make RX FIFO parameters tunable via sysfs")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Dan Carpenter 2017-07-17 11:34:23 +03:00 committed by Greg Kroah-Hartman
parent 2b01bfaeb4
commit 4ab3c51e05
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/tty/serial/sh-sci.c
View File

@ -1085,10 +1085,12 @@ static ssize_t rx_trigger_store(struct device *dev,
{ {
struct uart_port *port = dev_get_drvdata(dev); struct uart_port *port = dev_get_drvdata(dev);
struct sci_port *sci = to_sci_port(port); struct sci_port *sci = to_sci_port(port);
int ret;
long r; long r;
if (kstrtol(buf, 0, &r) == -EINVAL) ret = kstrtol(buf, 0, &r);
return -EINVAL; if (ret)
return ret;
sci->rx_trigger = scif_set_rtrg(port, r); sci->rx_trigger = scif_set_rtrg(port, r);
if (port->type == PORT_SCIFA || port->type == PORT_SCIFB) if (port->type == PORT_SCIFA || port->type == PORT_SCIFB)
@ -1116,10 +1118,12 @@ static ssize_t rx_fifo_timeout_store(struct device *dev,
{ {
struct uart_port *port = dev_get_drvdata(dev); struct uart_port *port = dev_get_drvdata(dev);
struct sci_port *sci = to_sci_port(port); struct sci_port *sci = to_sci_port(port);
int ret;
long r; long r;
if (kstrtol(buf, 0, &r) == -EINVAL) ret = kstrtol(buf, 0, &r);
return -EINVAL; if (ret)
return ret;
sci->rx_fifo_timeout = r; sci->rx_fifo_timeout = r;
scif_set_rtrg(port, 1); scif_set_rtrg(port, 1);
if (r > 0) if (r > 0)