Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp348198ybi; Fri, 7 Jun 2019 09:02:12 -0700 (PDT) X-Google-Smtp-Source: APXvYqyNzLA2v7gztnJK6usWCXxAIuCev75erPZqcWoAqFaw/+3TWUVHMDTZJ3gNDZ7+dyeaJxEX X-Received: by 2002:a17:902:306:: with SMTP id 6mr57254316pld.148.1559923332584; Fri, 07 Jun 2019 09:02:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559923332; cv=none; d=google.com; s=arc-20160816; b=lwP7w0zdwNqjD3L65Ui1T6iLtTpFEJ8qksEte8H742D0mkY8mHy9J6aBOFiwVnKRrI m/Cv0BEJZPJITYD6DjxdzDx8e8oL9W+AUpyKXlV7Cq4aUE5UzTZei0H4kX+5R4wP77SR Y6+T8ki6lyNnD5BlCzQAvzyiM36/nyi/jUhiAiArSkOjrU0b7A72wiIfFRjvIWb9tXEA jJc0nNm7mDv4YAynnplfCCDLPnwQgKMNE8q3fL4zxHjGTJ7+3Emqu7fMblhDbVxswkZ+ X2WecerBGk97DE2fiHlknWE0V1WgYaG5EcknQpzKlFmsfv2yWgpLax6qNdA1ZZjqfJgj uQFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=gcztqNaBif4KMJVNG9IUZieoQHnzvfdAmGNm8he+X8g=; b=N4mqoTtyhljquX10Hr6eTWEdq5w8nqBm1+aq7Edp/thxdQvZtA3Fsc+iZQhHXfQH7d Liyw3sCSwQ2ucR6B3S+jvn/h6efp+hKeL9ct6wuFzGNKZRF9vnOlb5ouvhJAATEOPvqL LUWxttvSMaQFLvcH1Ns6aFbDRBwsvFCoRH4v7OQrOciUS+oyo4+WniDSOg20PKUw5AMp RWpNCvAZ+HS/5v/GldsyOaWnJtLzkNCy43ZxIC6v7CmgVAH3VQ1JbmTGzX5EpFZ7/QQp tJNPZBK1I/y1Chpnu27J05fs1Dco6fHa8H7yGUxBuiDoMg3LHcj37UrbQx2iQkc3l+2W LkJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=dIfVvWNz; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q4si2233658pfg.286.2019.06.07.09.01.54; Fri, 07 Jun 2019 09:02:12 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=dIfVvWNz; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730776AbfFGP7E (ORCPT + 99 others); Fri, 7 Jun 2019 11:59:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:52604 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730485AbfFGPmL (ORCPT ); Fri, 7 Jun 2019 11:42:11 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 45B432133D; Fri, 7 Jun 2019 15:42:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559922130; bh=6Ajabuw9ON+eshjxs/JE69Gi3UxizKO+uTGIS/9UZe4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dIfVvWNzF+VkCj5NQ9BqvdqGA+9+YKnAEMOs5wtl0g2lDX2/TCLLzjQJJbHT9KwLe D6T8OAas57W+PkYoEK8R+OoDNLeOW209/6lf9W33fKj+0D2j48VfmdW2veyPUKbG0v 9tId+gbUS+UxC9eoWdMFXNuOZtJb9ZR2ImjCdMvg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Eric Dumazet , kbuild test robot , "David S. Miller" Subject: [PATCH 4.14 12/69] ipv4/igmp: fix build error if !CONFIG_IP_MULTICAST Date: Fri, 7 Jun 2019 17:38:53 +0200 Message-Id: <20190607153849.792403503@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190607153848.271562617@linuxfoundation.org> References: <20190607153848.271562617@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Eric Dumazet [ Upstream commit 903869bd10e6719b9df6718e785be7ec725df59f ] ip_sf_list_clear_all() needs to be defined even if !CONFIG_IP_MULTICAST Fixes: 3580d04aa674 ("ipv4/igmp: fix another memory leak in igmpv3_del_delrec()") Signed-off-by: Eric Dumazet Reported-by: kbuild test robot Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/ipv4/igmp.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) --- a/net/ipv4/igmp.c +++ b/net/ipv4/igmp.c @@ -190,6 +190,17 @@ static void ip_ma_put(struct ip_mc_list pmc != NULL; \ pmc = rtnl_dereference(pmc->next_rcu)) +static void ip_sf_list_clear_all(struct ip_sf_list *psf) +{ + struct ip_sf_list *next; + + while (psf) { + next = psf->sf_next; + kfree(psf); + psf = next; + } +} + #ifdef CONFIG_IP_MULTICAST /* @@ -635,17 +646,6 @@ static void igmpv3_clear_zeros(struct ip } } -static void ip_sf_list_clear_all(struct ip_sf_list *psf) -{ - struct ip_sf_list *next; - - while (psf) { - next = psf->sf_next; - kfree(psf); - psf = next; - } -} - static void kfree_pmc(struct ip_mc_list *pmc) { ip_sf_list_clear_all(pmc->sources);