From patchwork Wed Mar 24 11:47:00 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 48397 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 DFD71B7D04 for ; Wed, 24 Mar 2010 22:47:20 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755786Ab0CXLrN (ORCPT ); Wed, 24 Mar 2010 07:47:13 -0400 Received: from mail-bw0-f209.google.com ([209.85.218.209]:43821 "EHLO mail-bw0-f209.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755715Ab0CXLrM (ORCPT ); Wed, 24 Mar 2010 07:47:12 -0400 Received: by bwz1 with SMTP id 1so2762249bwz.21 for ; Wed, 24 Mar 2010 04:47:10 -0700 (PDT) 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=ofIh8KEIJoTzIX5pU7VBoEL/H2bTunf5l5iQxxs7Hws=; b=Elh1MuLweHQbRFo3BAF322LQRgVCWbaNXtxib1jrvRU+AlzNdgB5SlnU4V5OKfgfGt stoZu9J1rmeypaj3Z2j9TiwgWaKTgf+bhEWLc8uFlFEm5ZS3v0AOte56cTGYepSHshnV JfgzKthT524/6fLD7lNM0x/AljZBTUjGnPbKU= 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=K1qCEBkSpO3EptUlPbE61Ho0iWuBG/dQ1lVuzA6FJELrRHNH9Ez8R0jUbh1YytM09D dZx7LqO8I8ZPtOC5YdVP7Ttdl2PthwA5RS7REz22kXHLtQWlcCIv2CkeA5rjM3g/D9OC khDpx+DmTa1W2FOWz7mSz2E9sPjAszJDBDX08= Received: by 10.204.151.71 with SMTP id b7mr2002312bkw.104.1269431229928; Wed, 24 Mar 2010 04:47:09 -0700 (PDT) Received: from bicker ([196.43.68.195]) by mx.google.com with ESMTPS id l1sm34992339bkl.8.2010.03.24.04.47.06 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 24 Mar 2010 04:47:09 -0700 (PDT) Date: Wed, 24 Mar 2010 14:47:00 +0300 From: Dan Carpenter To: netdev@vger.kernel.org Cc: Jamal Hadi Salim , "David S. Miller" , Eric Dumazet , Stephen Hemminger , Alexey Dobriyan , kernel-janitors@vger.kernel.org Subject: [patch] af_key: return error if pfkey_xfrm_policy2msg_prep() fails Message-ID: <20100324114700.GB21571@bicker> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The original code saved the error value but just returned 0 in the end. Signed-off-by: Dan Carpenter Acked-by: Jamal Hadi Salim --- 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/key/af_key.c b/net/key/af_key.c index 3687078..344145f 100644 --- a/net/key/af_key.c +++ b/net/key/af_key.c @@ -2129,10 +2129,9 @@ static int key_notify_policy(struct xfrm_policy *xp, int dir, struct km_event *c int err; out_skb = pfkey_xfrm_policy2msg_prep(xp); - if (IS_ERR(out_skb)) { - err = PTR_ERR(out_skb); - goto out; - } + if (IS_ERR(out_skb)) + return PTR_ERR(out_skb); + err = pfkey_xfrm_policy2msg(out_skb, xp, dir); if (err < 0) return err; @@ -2148,7 +2147,6 @@ static int key_notify_policy(struct xfrm_policy *xp, int dir, struct km_event *c out_hdr->sadb_msg_seq = c->seq; out_hdr->sadb_msg_pid = c->pid; pfkey_broadcast(out_skb, GFP_ATOMIC, BROADCAST_ALL, NULL, xp_net(xp)); -out: return 0; }