OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Konstantin Khlebnikov 2016-04-18 14:37:10 +03:00 committed by David S. Miller
parent 851b10d608
commit 2309236c13
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/net/cls_cgroup.h
View File

@ -17,6 +17,7 @@
#include <linux/hardirq.h> #include <linux/hardirq.h>
#include <linux/rcupdate.h> #include <linux/rcupdate.h>
#include <net/sock.h> #include <net/sock.h>
#include <net/inet_sock.h>
#ifdef CONFIG_CGROUP_NET_CLASSID #ifdef CONFIG_CGROUP_NET_CLASSID
struct cgroup_cls_state { struct cgroup_cls_state {
@ -63,11 +64,13 @@ static inline u32 task_get_classid(const struct sk_buff *skb)
* softirqs always disables bh. * softirqs always disables bh.
*/ */
if (in_serving_softirq()) { if (in_serving_softirq()) {
struct sock *sk = skb_to_full_sk(skb);
/* If there is an sock_cgroup_classid we'll use that. */ /* If there is an sock_cgroup_classid we'll use that. */
if (!skb->sk) if (!sk || !sk_fullsock(sk))
return 0; return 0;
classid = sock_cgroup_classid(&skb->sk->sk_cgrp_data); classid = sock_cgroup_classid(&sk->sk_cgrp_data);
} }
return classid; return classid;