diff options
| author | Stevan Marinkovic <stevan.marinkovic@imgtec.com> | 2015-11-19 15:38:02 +0100 |
|---|---|---|
| committer | Ziyan <jaraidaniel@gmail.com> | 2016-03-11 16:09:09 +0100 |
| commit | 4473a5cae71c7326f269eaa3ade9fa05b9929f8f (patch) | |
| tree | 3f32262ef22c7a00aba7fe247f74d26a06297f05 /net/ipv4 | |
| parent | 5aba133c00683295b1f9b4ae0561cfed95ebd68a (diff) | |
| download | kernel_samsung_espresso10-4473a5cae71c7326f269eaa3ade9fa05b9929f8f.zip kernel_samsung_espresso10-4473a5cae71c7326f269eaa3ade9fa05b9929f8f.tar.gz kernel_samsung_espresso10-4473a5cae71c7326f269eaa3ade9fa05b9929f8f.tar.bz2 | |
Fix security issues reported by the android.security CTS
package
Contains following upstream changes:
a134f083e79fb4c3d0a925691e732c56911b4326
ipv4: Missing sk_nulls_node_init() in ping_unhash().
8176cced706b5e5d15887584150764894e94e02f
perf: Treat attr.config as u64 in perf_swevent_init()
e9c243a5a6de0be8e584c604d353412584b592f8
futex-prevent-requeue-pi-on-same-futex.patch futex: Forbid...
6f7b0a2a5c0fb03be7c25bd1745baa50582348ef
futex: Forbid uaddr == uaddr2 in futex_wait_requeue_pi()
Fixes CTS tests:
android.security.cts.NativeCodeTest#testFutex
android.security.cts.NativeCodeTest#testPerfEvent
android.security.cts.NativeCodeTest#testPingPongRoot
Change-Id: Ib9d389c875935e9eb9611be4fc11911383f627fc
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/ping.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c index 3f820c3..c6cff9a 100644 --- a/net/ipv4/ping.c +++ b/net/ipv4/ping.c @@ -153,6 +153,7 @@ void ping_unhash(struct sock *sk) if (sk_hashed(sk)) { write_lock_bh(&ping_table.lock); hlist_nulls_del(&sk->sk_nulls_node); + sk_nulls_node_init(&sk->sk_nulls_node); sock_put(sk); isk->inet_num = isk->inet_sport = 0; sock_prot_inuse_add(sock_net(sk), sk->sk_prot, -1); |