Commit f250dcda authored by Yang Hongyang's avatar Yang Hongyang Committed by David S. Miller
Browse files

ipv6: fix the return interface index when get it while no message is received 



When get receiving interface index while no message is received,
the the value seted with setsockopt() should be returned.

RFC 3542:
   Issuing getsockopt() for the above options will return the sticky
   option value i.e., the value set with setsockopt().  If no sticky
   option value has been set getsockopt() will return the following
   values:

   -  For the IPV6_PKTINFO option, it will return an in6_pktinfo
      structure with ipi6_addr being in6addr_any and ipi6_ifindex being
      zero.

Signed-off-by: default avatarYang Hongyang <yanghy@cn.fujitsu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b24a2516

net/ipv6/ipv6_sockglue.c

+8 −4
Original line number Diff line number Diff line
@@ -938,8 +938,10 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname, 
		} else {

			if (np->rxopt.bits.rxinfo) {

				struct in6_pktinfo src_info;

				src_info.ipi6_ifindex = np->mcast_oif ? np->mcast_oif : sk->sk_bound_dev_if;

				ipv6_addr_copy(&src_info.ipi6_addr, &np->daddr);

				src_info.ipi6_ifindex = np->mcast_oif ? np->mcast_oif :

					np->sticky_pktinfo.ipi6_ifindex;

				np->mcast_oif? ipv6_addr_copy(&src_info.ipi6_addr, &np->daddr) :

					ipv6_addr_copy(&src_info.ipi6_addr, &(np->sticky_pktinfo.ipi6_addr));

				put_cmsg(&msg, SOL_IPV6, IPV6_PKTINFO, sizeof(src_info), &src_info);

			}

			if (np->rxopt.bits.rxhlim) {
@@ -948,8 +950,10 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname, 
			}

			if (np->rxopt.bits.rxoinfo) {

				struct in6_pktinfo src_info;

				src_info.ipi6_ifindex = np->mcast_oif ? np->mcast_oif : sk->sk_bound_dev_if;

				ipv6_addr_copy(&src_info.ipi6_addr, &np->daddr);

				src_info.ipi6_ifindex = np->mcast_oif ? np->mcast_oif :

					np->sticky_pktinfo.ipi6_ifindex;

				np->mcast_oif? ipv6_addr_copy(&src_info.ipi6_addr, &np->daddr) :

					ipv6_addr_copy(&src_info.ipi6_addr, &(np->sticky_pktinfo.ipi6_addr));

				put_cmsg(&msg, SOL_IPV6, IPV6_2292PKTINFO, sizeof(src_info), &src_info);

			}

			if (np->rxopt.bits.rxohlim) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE