Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ipv4: Make IP_MULTICAST_ALL and IP_MSFILTER work on raw sockets

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 <quentin@armitage.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Quentin Armitage and committed by
David S. Miller
f5220d63 92bab4e7

+4 -1
+4 -1
net/ipv4/raw.c
··· 58 58 #include <linux/in_route.h> 59 59 #include <linux/route.h> 60 60 #include <linux/skbuff.h> 61 + #include <linux/igmp.h> 61 62 #include <net/net_namespace.h> 62 63 #include <net/dst.h> 63 64 #include <net/sock.h> ··· 175 174 176 175 while (sk) { 177 176 delivered = 1; 178 - if (iph->protocol != IPPROTO_ICMP || !icmp_filter(sk, skb)) { 177 + if ((iph->protocol != IPPROTO_ICMP || !icmp_filter(sk, skb)) && 178 + ip_mc_sf_allow(sk, iph->daddr, iph->saddr, 179 + skb->dev->ifindex)) { 179 180 struct sk_buff *clone = skb_clone(skb, GFP_ATOMIC); 180 181 181 182 /* Not releasing hash table! */