From patchwork Tue Dec 4 19:47:02 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Miller X-Patchwork-Id: 203731 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 CBEE52C008F for ; Wed, 5 Dec 2012 06:47:11 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752845Ab2LDTrK (ORCPT ); Tue, 4 Dec 2012 14:47:10 -0500 Received: from shards.monkeyblade.net ([149.20.54.216]:54418 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752101Ab2LDTrH (ORCPT ); Tue, 4 Dec 2012 14:47:07 -0500 Received: from localhost (nat-pool-rdu.redhat.com [66.187.233.202]) (Authenticated sender: davem-davemloft) by shards.monkeyblade.net (Postfix) with ESMTPSA id C6080581293; Tue, 4 Dec 2012 11:47:08 -0800 (PST) Date: Tue, 04 Dec 2012 14:47:02 -0500 (EST) Message-Id: <20121204.144702.1067637950249633761.davem@davemloft.net> To: fengguang.wu@intel.com Cc: nicolas.dichtel@6wind.com, netdev@vger.kernel.org Subject: Re: [net-next:master 153/162] net/ipv6/addrconf.c:503:11: error: 'struct ipv6_devconf' has no member named 'mc_forwarding' From: David Miller In-Reply-To: <50be5189.raDtevqQSzQSZzon%fengguang.wu@intel.com> References: <50be5189.raDtevqQSzQSZzon%fengguang.wu@intel.com> X-Mailer: Mew version 6.5 on Emacs 24.1 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Thanks, fixed as follows: -------------------- [PATCH] ipv6: Protect ->mc_forwarding access with CONFIG_IPV6_MROUTE Reported-by: Fengguang Wu Signed-off-by: David S. Miller Acked-by: Nicolas Dichtel --- net/ipv6/addrconf.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 28e0e62..6fca01f 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -469,8 +469,10 @@ static int inet6_netconf_msgsize_devconf(int type) /* type -1 is used for ALL */ if (type == -1 || type == NETCONFA_FORWARDING) size += nla_total_size(4); +#ifdef CONFIG_IPV6_MROUTE if (type == -1 || type == NETCONFA_MC_FORWARDING) size += nla_total_size(4); +#endif return size; } @@ -498,11 +500,12 @@ static int inet6_netconf_fill_devconf(struct sk_buff *skb, int ifindex, if ((type == -1 || type == NETCONFA_FORWARDING) && nla_put_s32(skb, NETCONFA_FORWARDING, devconf->forwarding) < 0) goto nla_put_failure; +#ifdef CONFIG_IPV6_MROUTE if ((type == -1 || type == NETCONFA_MC_FORWARDING) && nla_put_s32(skb, NETCONFA_MC_FORWARDING, devconf->mc_forwarding) < 0) goto nla_put_failure; - +#endif return nlmsg_end(skb, nlh); nla_put_failure: