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

Commit 8b0d3e81 authored by Ben Hutchings's avatar Ben Hutchings Committed by Greg Kroah-Hartman
Browse files

ipv6: Fix getsockopt() for sockets with default IPV6_AUTOFLOWLABEL 




[ Upstream commit e9191ffb65d8e159680ce0ad2224e1acbde6985c ]

Commit 513674b5a2c9 ("net: reevalulate autoflowlabel setting after
sysctl setting") removed the initialisation of
ipv6_pinfo::autoflowlabel and added a second flag to indicate
whether this field or the net namespace default should be used.

The getsockopt() handling for this case was not updated, so it
currently returns 0 for all sockets for which IPV6_AUTOFLOWLABEL is
not explicitly enabled.  Fix it to return the effective value, whether
that has been set at the socket or net namespace level.

Fixes: 513674b5a2c9 ("net: reevalulate autoflowlabel setting after sysctl ...")
Signed-off-by: default avatarBen Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5bb5ae97

include/net/ipv6.h

+1 −0
Original line number Diff line number Diff line
@@ -290,6 +290,7 @@ int ipv6_flowlabel_opt_get(struct sock *sk, struct in6_flowlabel_req *freq, 
			   int flags);

int ip6_flowlabel_init(void);

void ip6_flowlabel_cleanup(void);

bool ip6_autoflowlabel(struct net *net, const struct ipv6_pinfo *np);



static inline void fl6_sock_release(struct ip6_flowlabel *fl)

{

net/ipv6/ip6_output.c

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ int ip6_output(struct net *net, struct sock *sk, struct sk_buff *skb) 
			    !(IP6CB(skb)->flags & IP6SKB_REROUTED));

}



static bool ip6_autoflowlabel(struct net *net, const struct ipv6_pinfo *np)

bool ip6_autoflowlabel(struct net *net, const struct ipv6_pinfo *np)

{

	if (!np->autoflowlabel_set)

		return ip6_default_np_autolabel(net);

net/ipv6/ipv6_sockglue.c

+1 −1
Original line number Diff line number Diff line
@@ -1316,7 +1316,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname, 
		break;



	case IPV6_AUTOFLOWLABEL:

		val = np->autoflowlabel;

		val = ip6_autoflowlabel(sock_net(sk), np);

		break;



	default: