lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

netprio_cgroup: fix wrong memory access when NETPRIO_CGROUP=m

Browse Source 
When the netprio_cgroup module is not loaded, net_prio_subsys_id
is -1, and so sock_update_prioidx() accesses cgroup_subsys array
with negative index subsys[-1].

Make the code resembles cls_cgroup code, which is bug free.

Origionally-authored-by: Li Zefan <lizf@cn.fujitsu.com>
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
CC: "David S. Miller" <davem@davemloft.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Neil Horman
2012-02-10 05:43:38 +00:00
committed by David S. Miller
parent f5c38208d3
commit 2b73bc65e2
2 changed files with 42 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
net/core/sock.c
View File

@ -1171,13 +1171,10 @@ EXPORT_SYMBOL(sock_update_classid);
void sock_update_netprioidx(struct sock *sk)
{
struct cgroup_netprio_state *state;
if (in_interrupt())
return;
rcu_read_lock();
state = task_netprio_state(current);
sk->sk_cgrp_prioidx = state ? state->prioidx : 0;
rcu_read_unlock();
sk->sk_cgrp_prioidx = task_netprioidx(current);
}
EXPORT_SYMBOL_GPL(sock_update_netprioidx);
#endif