From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753851AbaGVIKc (ORCPT ); Tue, 22 Jul 2014 04:10:32 -0400 Received: from host-92-27-6-192.static.as13285.net ([92.27.6.192]:60511 "EHLO samson.armitage.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753323AbaGVIK1 (ORCPT ); Tue, 22 Jul 2014 04:10:27 -0400 X-Greylist: delayed 84432 seconds by postgrey-1.27 at vger.kernel.org; Tue, 22 Jul 2014 04:10:27 EDT Message-ID: <1406016610.2990.7.camel@samson1.armitage.org.uk> Subject: [PATCH v2] ipv4: Make IP_MULTICAST_ALL and IP_MSFILTER work on raw sockets From: Quentin Armitage To: Alexey Kuznetsov , James Morris , Hideaki YOSHIFUJI , Patrick McHardy , netdev@vger.kernel.org, "David S.Miller" Cc: linux-kernel@vger.kernel.org Date: Tue, 22 Jul 2014 09:10:10 +0100 Organization: The Armitage family Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.3 (3.2.3-3.fc16) Content-Transfer-Encoding: 7bit Mime-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently, although IP_MULTICAST_ALL and IP_MSFILTER ioctl calls succeed on raw sockets, there is no code to implement the functionality on received packets; it is only implemented for UDP sockets. The raw(7) man page states: "In addition, all ip(7) IPPROTO_IP socket options valid for datagram sockets are supported", which implies these ioctls should work on raw sockets. To fix this, add a call to ip_mc_sf_allow on raw sockets. This should not break any existing code, since the current position of not calling ip_mc_sf_filter makes it behave as if neither the IP_MULTICAST_ALL nor the IP_MSFILTER ioctl had been called. Adding the call to ip_mc_sf_allow will therefore maintain the current behaviour so long as IP_MULTICAST_ALL and IP_MSFILTER ioctls are not called. Any code that currently is calling IP_MULTICAST_ALL or IP_MSFILTER ioctls on raw sockets presumably is wanting the filter to be applied, although no filtering will currently be occurring. Signed-off-by: Quentin Armitage --- v2: * Fixed subject line --- net/ipv4/raw.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c index 2c65160..2e1628c 100644 --- a/net/ipv4/raw.c +++ b/net/ipv4/raw.c @@ -58,6 +58,7 @@ #include #include #include +#include #include #include #include @@ -174,7 +175,9 @@ static int raw_v4_input(struct sk_buff *skb, const struct iphdr *iph, int hash) while (sk) { delivered = 1; - if (iph->protocol != IPPROTO_ICMP || !icmp_filter(sk, skb)) { + if ((iph->protocol != IPPROTO_ICMP || !icmp_filter(sk, skb)) && + ip_mc_sf_allow(sk, iph->daddr, iph->saddr, + skb->dev->ifindex)) { struct sk_buff *clone = skb_clone(skb, GFP_ATOMIC); /* Not releasing hash table! */ -- 1.7.7.6