From patchwork Mon Apr 16 02:16:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gao Feng X-Patchwork-Id: 898408 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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; dmarc=fail (p=none dis=none) header.from=vip.163.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40PXHP0v6bz9s1l for ; Mon, 16 Apr 2018 12:23:29 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752796AbeDPCXS (ORCPT ); Sun, 15 Apr 2018 22:23:18 -0400 Received: from m181-177.vip.163.com ([123.58.177.181]:48484 "EHLO m181-177.vip.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752662AbeDPCXQ (ORCPT ); Sun, 15 Apr 2018 22:23:16 -0400 Received: from ikuai8.com (unknown [221.216.73.101]) by smtp2 (Coremail) with SMTP id oWZ4CgB3l2OYB9Raw7kZCg--.16464S3; Mon, 16 Apr 2018 10:17:12 +0800 (CST) From: gfree.wind@vip.163.com To: davem@davemloft.net, kuznet@ms2.inr.ac.ru, netdev@vger.kernel.org Cc: Gao Feng Subject: [PATCH net] net: Fix one possible memleak in ip_setup_cork Date: Mon, 16 Apr 2018 10:16:45 +0800 Message-Id: <1523845005-6353-2-git-send-email-gfree.wind@vip.163.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1523845005-6353-1-git-send-email-gfree.wind@vip.163.com> References: <1523845005-6353-1-git-send-email-gfree.wind@vip.163.com> X-CM-TRANSID: oWZ4CgB3l2OYB9Raw7kZCg--.16464S3 X-Coremail-Antispam: 1Uf129KBjvdXoW7JF45CF4UCFy3KFW7ZF1DWrg_yoWkCFc_Aa 4vgrW8Gr48uF1vya1kuFW3XFWftFZFvFn5uFnFg3s7ta4UAF1DZF4kZrZ3CFykCr42kFWU CFWqqFyxKw43ujkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IU8qLvJUUUUU== X-Originating-IP: [221.216.73.101] X-CM-SenderInfo: 5jiuvvgozl0vg6yl1hqrwthudrp/1tbiHwgqs1UH2PlDTAAAsy Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Gao Feng It would allocate memory in this function when the cork->opt is NULL. But the memory isn't freed if failed in the latter rt check, and return error directly. It causes the memleak if its caller is ip_make_skb which also doesn't free the cork->opt when meet a error. Now move the rt check ahead to avoid the memleak. Signed-off-by: Gao Feng --- net/ipv4/ip_output.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index 4c11b81..83c73ba 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@ -1109,6 +1109,10 @@ static int ip_setup_cork(struct sock *sk, struct inet_cork *cork, struct ip_options_rcu *opt; struct rtable *rt; + rt = *rtp; + if (unlikely(!rt)) + return -EFAULT; + /* * setup for corking. */ @@ -1124,9 +1128,7 @@ static int ip_setup_cork(struct sock *sk, struct inet_cork *cork, cork->flags |= IPCORK_OPT; cork->addr = ipc->addr; } - rt = *rtp; - if (unlikely(!rt)) - return -EFAULT; + /* * We steal reference to this route, caller should not release it */