From patchwork Thu Jun 23 05:58:02 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 101586 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 668D8B6F70 for ; Thu, 23 Jun 2011 15:58:56 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754392Ab1FWF6u (ORCPT ); Thu, 23 Jun 2011 01:58:50 -0400 Received: from mail-pz0-f46.google.com ([209.85.210.46]:37152 "EHLO mail-pz0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752061Ab1FWF6s (ORCPT ); Thu, 23 Jun 2011 01:58:48 -0400 Received: by pzk9 with SMTP id 9so975727pzk.19 for ; Wed, 22 Jun 2011 22:58:48 -0700 (PDT) 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=tMkFIcfICYOC9FSvpp8uGroyJmgO4Odpugrasvi6bOY=; b=DO7TWQb9+le+mPF0v7W21ZLNJlsR8shNTY9nwkwbUlJY22mLDBQLcA8z0+YlRNM42k 6LX8SDfQy7xMHLrqcTrU5lKSY6isM7guJX21S4cD8jfp9TGVuRcZh4ULdlnbeI7ldRFH dFv1E3BBuPJPAV35kt3TbtbNX3ZsC2Vv0FhNs= 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=QYeViSFfb422YYVlxR2k5isI0FJckp1ocSTM3M4RuBaMXJKWYCC5RDctBMNK4pU5mq s3djJ9jYOG2aoLY4PnAAQj0ph+w00odULA6SIlD1eLyy2BkyPYQcix+N2ia8HWDiaCGo XeR/sLgd1aM/Lt93vgXXD0XRLSQZs46N00FQs= Received: by 10.68.16.202 with SMTP id i10mr935407pbd.219.1308808728175; Wed, 22 Jun 2011 22:58:48 -0700 (PDT) Received: from shale.localdomain ([41.139.221.94]) by mx.google.com with ESMTPS id m7sm978661pbk.74.2011.06.22.22.58.43 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 22 Jun 2011 22:58:47 -0700 (PDT) Date: Thu, 23 Jun 2011 08:58:02 +0300 From: Dan Carpenter To: John Fastabend Cc: "David S. Miller" , Shmulik Ravid , "open list:NETWORKING [GENERAL]" , kernel-janitors@vger.kernel.org Subject: [patch -next] dcb: use nlmsg_free() instead of kfree() Message-ID: <20110623055802.GN14591@shale.localdomain> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org These sk_buff structs were allocated with nlmsg_new() so they should be freed with nlmsg_free(). 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 e954d4c..fc56e85 100644 --- a/net/dcb/dcbnl.c +++ b/net/dcb/dcbnl.c @@ -1329,7 +1329,7 @@ int dcbnl_notify(struct net_device *dev, int event, int cmd, nlh = nlmsg_put(skb, pid, 0, event, sizeof(*dcb), 0); if (nlh == NULL) { - kfree(skb); + nlmsg_free(skb); return -EMSGSIZE; } @@ -1434,7 +1434,7 @@ static int dcbnl_ieee_get(struct net_device *netdev, struct nlattr **tb, nlh = nlmsg_put(skb, pid, seq, RTM_GETDCB, sizeof(*dcb), flags); if (nlh == NULL) { - kfree(skb); + nlmsg_free(skb); return -EMSGSIZE; }