From patchwork Wed Jan 5 07:03:12 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 77572 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 B0E43B7118 for ; Wed, 5 Jan 2011 18:03:42 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751483Ab1AEHDg (ORCPT ); Wed, 5 Jan 2011 02:03:36 -0500 Received: from mail-gy0-f174.google.com ([209.85.160.174]:47802 "EHLO mail-gy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751298Ab1AEHDf (ORCPT ); Wed, 5 Jan 2011 02:03:35 -0500 Received: by gyb11 with SMTP id 11so5810081gyb.19 for ; Tue, 04 Jan 2011 23:03:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:mime-version:content-type:content-disposition:user-agent; bh=vVktxY12m/wiGJP1xLGVvUGB1yBNGtjiOMNlRYbMufY=; b=pYszILqwooqYZ5HbWy512k0ZtMZHq97BPKx636qVjR3HElrnszXJPkh8hiE+XgOYHt DokQU4NaRH5o1gPD9HC2/+hMdGGsxei/uuztUqUa2UX6xZ9QciUHtbfsGz6icWe+nGWW ONH7o+ZOfxDXpJgPXtM4C/Xe+FSOcPXWGoNk8= 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=jPKHDaSCGfI59R4uc0bCoEo3OdmhNaTyOcjjmInTLZalYsfKUzAJLHOjWa2FyDk+uc /W5gxXLesoHLYYfvag85XXwq/qdQdpNvuf6ODBuEImMtLOZNjHRr36wBW3jgAqCdRbwD QIGZq6n2bdfRT6C/yb+PzWpX/LqMh/Xkw3WzQ= Received: by 10.236.103.145 with SMTP id f17mr43413262yhg.12.1294211014255; Tue, 04 Jan 2011 23:03:34 -0800 (PST) Received: from bicker (h14ba.n2.ips.mtn.co.ug [212.88.116.186]) by mx.google.com with ESMTPS id j3sm13620179yha.7.2011.01.04.23.03.29 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 04 Jan 2011 23:03:33 -0800 (PST) Date: Wed, 5 Jan 2011 10:03:12 +0300 From: Dan Carpenter To: netdev@vger.kernel.org Cc: John Fastabend , Shmulik Ravid , "David S. Miller" , kernel-janitors@vger.kernel.org Subject: [patch 1/2] dcb: unlock on error in dcbnl_ieee_get() Message-ID: <20110105070312.GA24847@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 There is a "goto nla_put_failure" hidden inside the NLA_PUT() macro, but we're holding the dcb_lock so we need to unlock first. Signed-off-by: Dan Carpenter --- 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/dcb/dcbnl.c b/net/dcb/dcbnl.c index ff3c12d..8881cb5 100644 --- a/net/dcb/dcbnl.c +++ b/net/dcb/dcbnl.c @@ -1264,9 +1264,14 @@ static int dcbnl_ieee_get(struct net_device *netdev, struct nlattr **tb, spin_lock(&dcb_lock); list_for_each_entry(itr, &dcb_app_list, list) { - if (strncmp(itr->name, netdev->name, IFNAMSIZ) == 0) - NLA_PUT(skb, DCB_ATTR_IEEE_APP, - sizeof(itr->app), &itr->app); + if (strncmp(itr->name, netdev->name, IFNAMSIZ) == 0) { + err = nla_put(skb, DCB_ATTR_IEEE_APP, sizeof(itr->app), + &itr->app); + if (err) { + spin_unlock(&dcb_lock); + goto nla_put_failure; + } + } } spin_unlock(&dcb_lock); nla_nest_end(skb, app);