diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2017-01-03 11:23:35 -0800 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2017-01-03 11:23:35 -0800 |
| commit | aceae9be74c70f993ddd8d6a157f1a256591c43f (patch) | |
| tree | d8ef291e4467dfd1d28e31e8a2f38049fdcece2c /net/ipv4/ping.c | |
| parent | 9b133b6207826ae8cbe5f7de0b407253191e98fa (diff) | |
| parent | 676b8efcce52d582153d3df3bc90689cab07a058 (diff) | |
Merge remote-tracking branch 'common/android-4.4' into android-4.4.y
Change-Id: I44dc2744898ca59ad15cd77b49ad84da0220250a
Diffstat (limited to 'net/ipv4/ping.c')
| -rw-r--r-- | net/ipv4/ping.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c index cd2cf3515c66..495fefe6a898 100644 --- a/net/ipv4/ping.c +++ b/net/ipv4/ping.c @@ -796,7 +796,7 @@ static int ping_v4_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) flowi4_init_output(&fl4, ipc.oif, sk->sk_mark, tos, RT_SCOPE_UNIVERSE, sk->sk_protocol, inet_sk_flowi_flags(sk), faddr, saddr, 0, 0, - sock_i_uid(sk)); + sk->sk_uid); security_sk_classify_flow(sk, flowi4_to_flowi(&fl4)); rt = ip_route_output_flow(net, &fl4, sk); |