From patchwork Fri Oct 5 21:33:03 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Senna Tschudin X-Patchwork-Id: 189602 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id E6EF52C0313 for ; Sat, 6 Oct 2012 07:33:47 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757437Ab2JEVdc (ORCPT ); Fri, 5 Oct 2012 17:33:32 -0400 Received: from mail-wi0-f172.google.com ([209.85.212.172]:51449 "EHLO mail-wi0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754566Ab2JEVd3 (ORCPT ); Fri, 5 Oct 2012 17:33:29 -0400 Received: by mail-wi0-f172.google.com with SMTP id hq12so1358347wib.1 for ; Fri, 05 Oct 2012 14:33:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=40csTX0zHfOJCIoT2eOepCSDLvGFh3/vrO/0O//wW7k=; b=QBl1WY71OqvRJY8F7kmRytdpHWkqBooVqVQTyH2oKdhEsRrdJyM+MS920k6lim5FvE 1XoYpddU0qspvvWqqRKnVe8Xlk+g2hMjtyN3x9a0FxNnB+ZR96Tr0SI2M0b54wBYU0rv d4Gy1K5D1VIbz7eOIvAdqeomyJgI6TDmZBfxH9RSx/eFjzDvWbCd7GYyyn6JqymoM7Ty d4JoqFaqZUTmEHPOmHfUjNlyl83kQeQMWgOP9yA+p1EXSyD37B7Bgd+9SFGLFK7QUVXH 5+DTWrlXoAC1oHacdmDhfMRv0vHVjUcjBrogQYsE0cR86fdwNxNu+g79w1uiN/WXtow9 wtGQ== Received: by 10.216.210.11 with SMTP id t11mr5970622weo.92.1349472807690; Fri, 05 Oct 2012 14:33:27 -0700 (PDT) Received: from ace.home ([37.175.200.243]) by mx.google.com with ESMTPS id v3sm5048951wiy.5.2012.10.05.14.33.26 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 05 Oct 2012 14:33:27 -0700 (PDT) From: Peter Senna Tschudin To: samuel@sortiz.org Cc: irda-users@lists.sourceforge.net, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Peter Senna Tschudin Subject: [PATCH 6/20 V2] drivers/net/irda/irtty-sir.c: fix error return code Date: Fri, 5 Oct 2012 23:33:03 +0200 Message-Id: <1349472786-10921-2-git-send-email-peter.senna@gmail.com> X-Mailer: git-send-email 1.7.11.4 In-Reply-To: <1349472786-10921-1-git-send-email-peter.senna@gmail.com> References: <1349472786-10921-1-git-send-email-peter.senna@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Peter Senna Tschudin 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/) // ( if@p1 (\(ret < 0\|ret != 0\)) { ... return ret; } | ret@p1 = 0 ) ... when != ret = e1 when != &ret *if(...) { ... when != ret = e2 when forall return ret; } // Signed-off-by: Peter Senna Tschudin --- Change from V1: Updated commit message. See: http://www.kernelhub.org/?p=2&msg=139319 drivers/net/irda/irtty-sir.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/irda/irtty-sir.c b/drivers/net/irda/irtty-sir.c index 30087ca..6e4d4b6 100644 --- a/drivers/net/irda/irtty-sir.c +++ b/drivers/net/irda/irtty-sir.c @@ -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;