[NETFILTER] xt_pkttype match fixes

[NETFILTER] xt_pkttype match fixes

[Jan Engelhardt]

We were always interpreting an IPv6 packet as IPv4, but
ipv4_is_multicast() is only valid for AF_INET (obviously). Fix this
by adding an extra condition to check for AF_INET.

Signed-off-by: Jan Engelhardt <jengelh@computergmbh.de>

---
 net/netfilter/xt_pkttype.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Index: linux-2.6_nosov/net/netfilter/xt_pkttype.c
===================================================================
--- linux-2.6_nosov.orig/net/netfilter/xt_pkttype.c
+++ linux-2.6_nosov/net/netfilter/xt_pkttype.c
@@ -31,7 +31,8 @@ pkttype_mt(const struct sk_buff *skb, co
 	const struct xt_pkttype_info *info = matchinfo;
 
 	if (skb->pkt_type == PACKET_LOOPBACK)
-		type = ipv4_is_multicast(ip_hdr(skb)->daddr)
+		type = match->family == AF_INET &&
+		       ipv4_is_multicast(ip_hdr(skb)->daddr)
 			? PACKET_MULTICAST
 			: PACKET_BROADCAST;
 	else

Re: [stable] [NETFILTER] xt_pkttype match fixes

[Greg KH]

On Sat, Dec 22, 2007 at 03:41:29AM +0100, Jan Engelhardt wrote:
> 
> We were always interpreting an IPv6 packet as IPv4, but
> ipv4_is_multicast() is only valid for AF_INET (obviously). Fix this
> by adding an extra condition to check for AF_INET.
> 
> Signed-off-by: Jan Engelhardt <jengelh@computergmbh.de>

Did this ever go into Linus's tree?  I don't see it there, and as such,
I can't take this for the -stable tree, sorry.

thanks,

greg k-h

Re: [stable] [NETFILTER] xt_pkttype match fixes

[Patrick McHardy]

Greg KH wrote:
> On Sat, Dec 22, 2007 at 03:41:29AM +0100, Jan Engelhardt wrote:
>> We were always interpreting an IPv6 packet as IPv4, but
>> ipv4_is_multicast() is only valid for AF_INET (obviously). Fix this
>> by adding an extra condition to check for AF_INET.
>>
>> Signed-off-by: Jan Engelhardt <jengelh@computergmbh.de>
> 
> Did this ever go into Linus's tree?  I don't see it there, and as such,
> I can't take this for the -stable tree, sorry.


I have it queued for 2.6.25 since I missed Jan's initial posting.

But the patch only affects a minor corner case (IPv6 multicast
on loopback might be classified as broadcast), so I don't think
it qualifies for -stable anyways.

Re: [stable] [NETFILTER] xt_pkttype match fixes

[Greg KH]

On Tue, Jan 15, 2008 at 07:07:59AM +0100, Patrick McHardy wrote:
> Greg KH wrote:
>> On Sat, Dec 22, 2007 at 03:41:29AM +0100, Jan Engelhardt wrote:
>>> We were always interpreting an IPv6 packet as IPv4, but
>>> ipv4_is_multicast() is only valid for AF_INET (obviously). Fix this
>>> by adding an extra condition to check for AF_INET.
>>>
>>> Signed-off-by: Jan Engelhardt <jengelh@computergmbh.de>
>>
>> Did this ever go into Linus's tree?  I don't see it there, and as such,
>> I can't take this for the -stable tree, sorry.
>
>
> I have it queued for 2.6.25 since I missed Jan's initial posting.
>
> But the patch only affects a minor corner case (IPv6 multicast
> on loopback might be classified as broadcast), so I don't think
> it qualifies for -stable anyways.

Ok, thanks for letting me know, I'll drop it from my to-apply queue.

greg k-h