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

Commit 2309236c authored by Konstantin Khlebnikov's avatar Konstantin Khlebnikov Committed by David S. Miller
Browse files

cls_cgroup: get sk_classid only from full sockets 



skb->sk could point to timewait or request socket which has no sk_classid.
Detected as "BUG: KASAN: slab-out-of-bounds in cls_cgroup_classify".

Signed-off-by: default avatarKonstantin Khlebnikov <khlebnikov@yandex-team.ru>
Acked-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 851b10d6

include/net/cls_cgroup.h

+5 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/hardirq.h>

#include <linux/rcupdate.h>

#include <net/sock.h>

#include <net/inet_sock.h>



#ifdef CONFIG_CGROUP_NET_CLASSID

struct cgroup_cls_state {
@@ -63,11 +64,13 @@ static inline u32 task_get_classid(const struct sk_buff *skb) 
	 * softirqs always disables bh.

	 */

	if (in_serving_softirq()) {

		struct sock *sk = skb_to_full_sk(skb);



		/* If there is an sock_cgroup_classid we'll use that. */

		if (!skb->sk)

		if (!sk || !sk_fullsock(sk))

			return 0;



		classid = sock_cgroup_classid(&skb->sk->sk_cgrp_data);

		classid = sock_cgroup_classid(&sk->sk_cgrp_data);

	}



	return classid;