Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2776ff0 authored by YOSHIFUJI Hideaki's avatar YOSHIFUJI Hideaki Committed by David S. Miller
Browse files

[IPV6]: Fix address/interface handling in UDP and DCCP, according to the scoping architecture. 



TCP and RAW do not have this issue.  Closes Bug #7432.

Signed-off-by: default avatarYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 700f9672

net/dccp/ipv6.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -277,7 +277,7 @@ static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, 
	__u64 seq;

	__u64 seq;





	sk = inet6_lookup(&dccp_hashinfo, &hdr->daddr, dh->dccph_dport,

	sk = inet6_lookup(&dccp_hashinfo, &hdr->daddr, dh->dccph_dport,

			  &hdr->saddr, dh->dccph_sport, skb->dev->ifindex);

			  &hdr->saddr, dh->dccph_sport, inet6_iif(skb));





	if (sk == NULL) {

	if (sk == NULL) {

		ICMP6_INC_STATS_BH(__in6_dev_get(skb->dev), ICMP6_MIB_INERRORS);

		ICMP6_INC_STATS_BH(__in6_dev_get(skb->dev), ICMP6_MIB_INERRORS);

net/ipv6/udp.c

+3 −4
Original line number Original line Diff line number Diff line
@@ -242,14 +242,13 @@ static void udpv6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, 
{

{

	struct ipv6_pinfo *np;

	struct ipv6_pinfo *np;

	struct ipv6hdr *hdr = (struct ipv6hdr*)skb->data;

	struct ipv6hdr *hdr = (struct ipv6hdr*)skb->data;

	struct net_device *dev = skb->dev;

	struct in6_addr *saddr = &hdr->saddr;

	struct in6_addr *saddr = &hdr->saddr;

	struct in6_addr *daddr = &hdr->daddr;

	struct in6_addr *daddr = &hdr->daddr;

	struct udphdr *uh = (struct udphdr*)(skb->data+offset);

	struct udphdr *uh = (struct udphdr*)(skb->data+offset);

	struct sock *sk;

	struct sock *sk;

	int err;

	int err;





	sk = udp_v6_lookup(daddr, uh->dest, saddr, uh->source, dev->ifindex);

	sk = udp_v6_lookup(daddr, uh->dest, saddr, uh->source, inet6_iif(skb));

   

   

	if (sk == NULL)

	if (sk == NULL)

		return;

		return;
@@ -348,7 +347,7 @@ static void udpv6_mcast_deliver(struct udphdr *uh, 




	read_lock(&udp_hash_lock);

	read_lock(&udp_hash_lock);

	sk = sk_head(&udp_hash[ntohs(uh->dest) & (UDP_HTABLE_SIZE - 1)]);

	sk = sk_head(&udp_hash[ntohs(uh->dest) & (UDP_HTABLE_SIZE - 1)]);

	dif = skb->dev->ifindex;

	dif = inet6_iif(skb);

	sk = udp_v6_mcast_next(sk, uh->dest, daddr, uh->source, saddr, dif);

	sk = udp_v6_mcast_next(sk, uh->dest, daddr, uh->source, saddr, dif);

	if (!sk) {

	if (!sk) {

		kfree_skb(skb);

		kfree_skb(skb);
@@ -429,7 +428,7 @@ static int udpv6_rcv(struct sk_buff **pskb) 
	 * check socket cache ... must talk to Alan about his plans

	 * check socket cache ... must talk to Alan about his plans

	 * for sock caches... i'll skip this for now.

	 * for sock caches... i'll skip this for now.

	 */

	 */

	sk = udp_v6_lookup(saddr, uh->source, daddr, uh->dest, dev->ifindex);

	sk = udp_v6_lookup(saddr, uh->source, daddr, uh->dest, inet6_iif(skb));





	if (sk == NULL) {

	if (sk == NULL) {

		if (!xfrm6_policy_check(NULL, XFRM_POLICY_IN, skb))

		if (!xfrm6_policy_check(NULL, XFRM_POLICY_IN, skb))