From patchwork Wed Jan 10 11:45:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 858234 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Ip7H7FwS"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zGnJm4wg8z9s8J for ; Wed, 10 Jan 2018 22:46:00 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934031AbeAJLp6 (ORCPT ); Wed, 10 Jan 2018 06:45:58 -0500 Received: from mail-io0-f195.google.com ([209.85.223.195]:44232 "EHLO mail-io0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933212AbeAJLpy (ORCPT ); Wed, 10 Jan 2018 06:45:54 -0500 Received: by mail-io0-f195.google.com with SMTP id k18so22117660ioc.11 for ; Wed, 10 Jan 2018 03:45:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:subject:from:to:cc:date:mime-version :content-transfer-encoding; bh=H6UTv3LdMvuGqkbd8doqfYNmpTSz00nqUEW7fcVlgN4=; b=Ip7H7FwS+REtOjWAtG06UQsKMsTPldmcsq3vAsAW2+HCBLR9ThASoSrjHDsj+C3vh+ iYAv05h6/eAYmKMiaBT2t8WMT1HP2Yl3VQ2ghu9QHVifMRwo9/cNsA0eFnUfrk8etV5t rgucOEJa/l0opXQG/GfIP3JkXUklvegDS1bRjwi7hmORWDw+Udl+cIsmdKK6ei2ctQDK J8i9D4gBnRbUHUa/AsMBksXOOhmJrsLJ+HNvLM7TslhSHiQ5B5oEwY37lNYv+trc4Stt DIf++bepWWCNVdSACI4obH6kggCRVowQA0cSHfToFdyZHmuohczCgSmbPNJEngmatOvv oHfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:subject:from:to:cc:date:mime-version :content-transfer-encoding; bh=H6UTv3LdMvuGqkbd8doqfYNmpTSz00nqUEW7fcVlgN4=; b=o13h/MuxZkWpTPM4/QGklnRX1VgSBO770mQL/0NQH5WJYM5IVUDpwUvNG/PywjnAri 1kEAttXF7XmaQT6FAT1Kf/1LcazXQJA/5UJeqvYgQM2dj8eaRYgcE6mJiKA0mgYsPeJH S7KidzYmOaRpme+8r2En76qdTVv7IQZYtnf3quPEerYF84QpIWa/ui9Vmcl5yqXJEjfi KAzv+9PimILH97o+sL4Rg8XQrczg/OpnPgQzntCA+p3L0ipDpTkv8ItnrkXyNOGLrFZU qPBZaFMTkBkj//Vxohnd1gca5F8zWOZejseBkAPPEdyBsoanBvwwQpwVVg5JVsV4Icu6 IPNw== X-Gm-Message-State: AKwxytcTN18nLtC3snmvhSwPy09k7OS/xaXgssT1wUcEQonRS9+/iV42 /yGC+qlr4nua1tmYxVyijeA= X-Google-Smtp-Source: ACJfBovhB5v30r9zA+9g3s1FHJSp8ZqwCpaCGgaJkzZqZtGpN6VerJ8WZkXPIZwqwmsyNeeEHeyKHQ== X-Received: by 10.107.137.96 with SMTP id l93mr18277270iod.212.1515584753009; Wed, 10 Jan 2018 03:45:53 -0800 (PST) Received: from edumazet-glaptop3.lan (c-67-180-167-114.hsd1.ca.comcast.net. [67.180.167.114]) by smtp.googlemail.com with ESMTPSA id 72sm10185279iol.64.2018.01.10.03.45.51 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 10 Jan 2018 03:45:51 -0800 (PST) Message-ID: <1515584749.131759.21.camel@gmail.com> Subject: [PATCH net] ipv6: fix possible mem leaks in ipv6_make_skb() From: Eric Dumazet To: Vladislav Yasevich , David Miller Cc: netdev , Mike Maloney Date: Wed, 10 Jan 2018 03:45:49 -0800 X-Mailer: Evolution 3.22.6-1+deb9u1 Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Eric Dumazet ip6_setup_cork() might return an error, while memory allocations have been done and must be rolled back. Fixes: 6422398c2ab0 ("ipv6: introduce ipv6_make_skb") Signed-off-by: Eric Dumazet Cc: Vlad Yasevich Reported-by: Mike Maloney Acked-by: Mike Maloney ---  net/ipv6/ip6_output.c |    5 +++--  1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index f7dd51c4231415fd1321fd431194d896ea2d1689..688ba5f7516b37c87b879036dce781bdcfa01739 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -1735,9 +1735,10 @@ struct sk_buff *ip6_make_skb(struct sock *sk, cork.base.opt = NULL; v6_cork.opt = NULL; err = ip6_setup_cork(sk, &cork, &v6_cork, ipc6, rt, fl6); - if (err) + if (err) { + ip6_cork_release(&cork, &v6_cork); return ERR_PTR(err); - + } if (ipc6->dontfrag < 0) ipc6->dontfrag = inet6_sk(sk)->dontfrag;