diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2015-05-11 14:39:59 +0530 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2015-05-11 18:10:19 +0530 |
| commit | 708981f223366eb722af86b96b215f052368341e (patch) | |
| tree | 69db2372c4aea4e3079b88f07c693c304e112b67 | |
| parent | e945ef40a3bbb4441681835add65bf95d9f68f87 (diff) | |
nf: IDLETIMER: Fix broken uid field in the msgtracking-linaro-android-llct-llct-20150518.0tracking-linaro-android-llct-llct-20150512.0
Create uid from kuid to fix the broken uid field
in the message notifications introduced in
Change-Id: I18fc73eada512e370d7ab24fc9f890845037b729,
Otherwise we run into following build error:
---------------
CC net/netfilter/xt_IDLETIMER.o
net/netfilter/xt_IDLETIMER.c: In function ‘reset_timer’:
net/netfilter/xt_IDLETIMER.c:360:16: error: incompatible types when assigning to type ‘uid_t’ from type ‘kuid_t’
make[2]: *** [net/netfilter/xt_IDLETIMER.o] Error 1
---------------
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
| -rw-r--r-- | net/netfilter/xt_IDLETIMER.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/net/netfilter/xt_IDLETIMER.c b/net/netfilter/xt_IDLETIMER.c index ddf77f7fbe24..31f76cd19d39 100644 --- a/net/netfilter/xt_IDLETIMER.c +++ b/net/netfilter/xt_IDLETIMER.c @@ -353,12 +353,8 @@ static void reset_timer(const struct idletimer_tg_info *info, /* Stores the uid resposible for waking up the radio */ if (skb && (skb->sk)) { - struct sock *sk = skb->sk; - read_lock_bh(&sk->sk_callback_lock); - if ((sk->sk_socket) && (sk->sk_socket->file) && - (sk->sk_socket->file->f_cred)) - timer->uid = sk->sk_socket->file->f_cred->uid; - read_unlock_bh(&sk->sk_callback_lock); + timer->uid = from_kuid_munged(current_user_ns(), + sock_i_uid(skb->sk)); } /* checks if there is a pending inactive notification*/ |