From patchwork Sat Jan 15 13:06:39 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 79052 X-Patchwork-Delegate: davem@davemloft.net 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 266C7B6EED for ; Sun, 16 Jan 2011 00:07:00 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753052Ab1AONGz (ORCPT ); Sat, 15 Jan 2011 08:06:55 -0500 Received: from mail-ww0-f42.google.com ([74.125.82.42]:39644 "EHLO mail-ww0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752968Ab1AONGx (ORCPT ); Sat, 15 Jan 2011 08:06:53 -0500 Received: by wwi17 with SMTP id 17so608024wwi.1 for ; Sat, 15 Jan 2011 05:06:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:date:from:to:cc:subject:message-id:mime-version :content-type:content-disposition:user-agent; bh=hQZVCBhlh/gYuiJ9wZ9b738kY3SVgGd3tgSQmLuKn8E=; b=oc1AHIE/h1a6dEKfYvkfSmq0vhgmS1co4YN+Z9qAODaqta+7PxMXXhIUvtt9podwDu b4Ory1pYby1V8ZhwZHL2mzOmQv2PIfRBEPs0z/hiulUnUU7zXaoPbgEYOTL54ojzPNsw ha7dqvx7dTmWRBD3WKLrGVjH5J/pi9vzxG2tQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; b=Dswl8F1nRE+JMFZYj4t9agWze6e/zoBDlkDmU9tOAitoyRChJOledWGrAfR6stbaqn nw90W8GLcbDl2fa18elbw7hMZwjAdfOggxeO1Xyqjx/KFE6Jens9Dwh/8ZvxDLlmMvX4 b1quL0N1ExG+mRgPytFdl3NyCRJLwdta8YABs= Received: by 10.216.171.68 with SMTP id q46mr533474wel.98.1295096811731; Sat, 15 Jan 2011 05:06:51 -0800 (PST) Received: from bicker ([41.202.225.145]) by mx.google.com with ESMTPS id 7sm1231535wet.24.2011.01.15.05.06.47 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 15 Jan 2011 05:06:50 -0800 (PST) Date: Sat, 15 Jan 2011 16:06:39 +0300 From: Dan Carpenter To: Sjur Braendeland Cc: "David S. Miller" , netdev@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [patch] caif: checking the wrong variable Message-ID: <20110115130639.GA2721@bicker> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In the original code we check if (servl == NULL) twice. The first time should print the message that cfmuxl_remove_uplayer() failed and set "ret" correctly, but instead it just returns success. The second check should be checking the value of "ret" instead of "servl". Signed-off-by: Dan Carpenter Acked-by: Sjur Braendeland --- 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/net/caif/cfcnfg.c b/net/caif/cfcnfg.c index 21ede14..c665de7 100644 --- a/net/caif/cfcnfg.c +++ b/net/caif/cfcnfg.c @@ -191,6 +191,7 @@ int cfcnfg_disconn_adapt_layer(struct cfcnfg *cnfg, struct cflayer *adap_layer) struct cflayer *servl = NULL; struct cfcnfg_phyinfo *phyinfo = NULL; u8 phyid = 0; + caif_assert(adap_layer != NULL); channel_id = adap_layer->id; if (adap_layer->dn == NULL || channel_id == 0) { @@ -199,16 +200,16 @@ int cfcnfg_disconn_adapt_layer(struct cfcnfg *cnfg, struct cflayer *adap_layer) goto end; } servl = cfmuxl_remove_uplayer(cnfg->mux, channel_id); - if (servl == NULL) - goto end; - layer_set_up(servl, NULL); - ret = cfctrl_linkdown_req(cnfg->ctrl, channel_id, adap_layer); if (servl == NULL) { pr_err("PROTOCOL ERROR - Error removing service_layer Channel_Id(%d)", channel_id); ret = -EINVAL; goto end; } + layer_set_up(servl, NULL); + ret = cfctrl_linkdown_req(cnfg->ctrl, channel_id, adap_layer); + if (ret) + goto end; caif_assert(channel_id == servl->id); if (adap_layer->dn != NULL) { phyid = cfsrvl_getphyid(adap_layer->dn);