Skip to content

Commit

Permalink
drivers/net/irda/irtty-sir.c: fix error return code
Browse files Browse the repository at this point in the history
The function irtty_open() return 0 for success and negative value
for most of its internal tests failures. There is one exception
that is error case going to out_put:. For this error case, the
function abort its success execution path, but returns non negative
value, making it difficult for a caller function to notice the error.

This patch fixes the error case that do not return negative value.

This was found by Coccinelle, but the code change was made by hand.
This patch is not robot generated.

A simplified version of the semantic match that finds this problem is
as follows: (http://coccinelle.lip6.fr/)

// <smpl>
(
if@p1 (\(ret < 0\|ret != 0\))
 { ... return ret; }
|
ret@p1 = 0
)
... when != ret = e1
    when != &ret
*if(...)
{
  ... when != ret = e2
      when forall
 return ret;
}
// </smpl>

Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Peter Senna Tschudin authored and David S. Miller committed Oct 7, 2012
1 parent 0968a9d commit 8728647
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion drivers/net/irda/irtty-sir.c
Original file line number Diff line number Diff line change
Expand Up @@ -459,8 +459,10 @@ static int irtty_open(struct tty_struct *tty)

/* allocate private device info block */
priv = kzalloc(sizeof(*priv), GFP_KERNEL);
if (!priv)
if (!priv) {
ret = -ENOMEM;
goto out_put;
}

priv->magic = IRTTY_MAGIC;
priv->tty = tty;
Expand Down

0 comments on commit 8728647

Please sign in to comment.