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

Commit 28693079 authored by David S. Miller's avatar David S. Miller
Browse files

[IPV6]: Handle np->opt being NULL in ipv6_getsockopt_sticky(). 



Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d644329b

net/ipv6/ipv6_sockglue.c

+7 −3
Original line number Diff line number Diff line
@@ -795,11 +795,15 @@ int compat_ipv6_setsockopt(struct sock *sk, int level, int optname, 
EXPORT_SYMBOL(compat_ipv6_setsockopt);

#endif



static int ipv6_getsockopt_sticky(struct sock *sk, struct ipv6_opt_hdr *hdr,

static int ipv6_getsockopt_sticky(struct sock *sk, struct ipv6_txoptions *opt,

				  char __user *optval, int len)

{

	if (!hdr)

	struct ipv6_opt_hdr *hdr;



	if (!opt || !opt->hopopt)

		return 0;

	hdr = opt->hopopt;



	len = min_t(int, len, ipv6_optlen(hdr));

	if (copy_to_user(optval, hdr, ipv6_optlen(hdr)))

		return -EFAULT;
@@ -940,7 +944,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname, 
	{



		lock_sock(sk);

		len = ipv6_getsockopt_sticky(sk, np->opt->hopopt,

		len = ipv6_getsockopt_sticky(sk, np->opt,

					     optval, len);

		release_sock(sk);

		return put_user(len, optlen);