From patchwork Sat Dec 13 19:17:45 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ilpo_J=C3=A4rvinen?= X-Patchwork-Id: 13837 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.176.167]) by ozlabs.org (Postfix) with ESMTP id D121BDDFD5 for ; Sun, 14 Dec 2008 06:18:40 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751686AbYLMTSQ (ORCPT ); Sat, 13 Dec 2008 14:18:16 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751657AbYLMTSH (ORCPT ); Sat, 13 Dec 2008 14:18:07 -0500 Received: from courier.cs.helsinki.fi ([128.214.9.1]:55749 "EHLO mail.cs.helsinki.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750919AbYLMTRz (ORCPT ); Sat, 13 Dec 2008 14:17:55 -0500 Received: from wrl-59.cs.helsinki.fi (wrl-59.cs.helsinki.fi [128.214.166.179]) (AUTH: PLAIN cs-relay, TLS: TLSv1/SSLv3,256bits,AES256-SHA) by mail.cs.helsinki.fi with esmtp; Sat, 13 Dec 2008 21:17:52 +0200 id 0008C285.49440A60.00004392 Received: by wrl-59.cs.helsinki.fi (Postfix, from userid 50795) id 030A7A0096; Sat, 13 Dec 2008 21:17:51 +0200 (EET) From: "=?ISO-8859-1?Q?Ilpo_J=E4rvinen?=" To: David Miller Cc: netdev@vger.kernel.org Subject: [PATCH 05/11] xfrm: join error paths Date: Sat, 13 Dec 2008 21:17:45 +0200 Message-Id: <12291958712305-git-send-email-ilpo.jarvinen@helsinki.fi> X-Mailer: git-send-email 1.5.2.2 In-Reply-To: <12291958713600-git-send-email-ilpo.jarvinen@helsinki.fi> References: <12291958711278-git-send-email-ilpo.jarvinen@helsinki.fi> <1229195871718-git-send-email-ilpo.jarvinen@helsinki.fi> <12291958711089-git-send-email-ilpo.jarvinen@helsinki.fi> <12291958711225-git-send-email-ilpo.jarvinen@helsinki.fi> <12291958713600-git-send-email-ilpo.jarvinen@helsinki.fi> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Ilpo Järvinen --- net/xfrm/xfrm_user.c | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c index 38ffaf3..b95a2d6 100644 --- a/net/xfrm/xfrm_user.c +++ b/net/xfrm/xfrm_user.c @@ -1688,21 +1688,16 @@ static int xfrm_add_acquire(struct sk_buff *skb, struct nlmsghdr *nlh, int err = -ENOMEM; if (!x) - return err; + goto nomem; err = verify_newpolicy_info(&ua->policy); - if (err) { - printk("BAD policy passed\n"); - kfree(x); - return err; - } + if (err) + goto bad_policy; /* build an XP */ xp = xfrm_policy_construct(net, &ua->policy, attrs, &err); - if (!xp) { - kfree(x); - return err; - } + if (!xp) + goto free_state; memcpy(&x->id, &ua->id, sizeof(ua->id)); memcpy(&x->props.saddr, &ua->saddr, sizeof(ua->saddr)); @@ -1727,6 +1722,13 @@ static int xfrm_add_acquire(struct sk_buff *skb, struct nlmsghdr *nlh, kfree(xp); return 0; + +bad_policy: + printk("BAD policy passed\n"); +free_state: + kfree(x); +nomem: + return err; } #ifdef CONFIG_XFRM_MIGRATE