Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects 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
Show stats Download patch file Download diff file Expand all files Collapse all files

48
include/net/netprio_cgroup.h
View file

@ -37,19 +37,51 @@ extern int net_prio_subsys_id;
extern void sock_update_netprioidx(struct sock *sk); extern void sock_update_netprioidx(struct sock *sk);
static inline struct cgroup_netprio_state #if IS_BUILTIN(CONFIG_NETPRIO_CGROUP)
*task_netprio_state(struct task_struct *p)
static inline u32 task_netprioidx(struct task_struct *p)
{ {
#if IS_ENABLED(CONFIG_NETPRIO_CGROUP) struct cgroup_netprio_state *state;
return container_of(task_subsys_state(p, net_prio_subsys_id), u32 idx;
struct cgroup_netprio_state, css);
#else rcu_read_lock();
return NULL; state = container_of(task_subsys_state(p, net_prio_subsys_id),
#endif struct cgroup_netprio_state, css);
idx = state->prioidx;
rcu_read_unlock();
return idx;
}
#elif IS_MODULE(CONFIG_NETPRIO_CGROUP)
static inline u32 task_netprioidx(struct task_struct *p)
{
struct cgroup_netprio_state *state;
int subsys_id;
u32 idx = 0;
rcu_read_lock();
subsys_id = rcu_dereference_index_check(net_prio_subsys_id,
rcu_read_lock_held());
if (subsys_id >= 0) {
state = container_of(task_subsys_state(p, subsys_id),
struct cgroup_netprio_state, css);
idx = state->prioidx;
}
rcu_read_unlock();
return idx;
} }
#else #else
static inline u32 task_netprioidx(struct task_struct *p)
{
return 0;
}
#endif /* CONFIG_NETPRIO_CGROUP */
#else
#define sock_update_netprioidx(sk) #define sock_update_netprioidx(sk)
#endif #endif

7
net/core/sock.c
View file

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