diff options
author | Zoltan Herpai <wigyori@uid0.hu> | 2016-10-26 15:33:07 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-26 15:33:07 +0200 |
commit | 1378f4a4d9908dd48dcf21ee526334d86344ec68 (patch) | |
tree | 1da1495f9fc9f046a169fb451ea5e6af13cc6453 /target/linux/generic/patches-3.18/080-11-fib_trie-Push-rcu_read_lock-unlock-to-callers.patch | |
parent | 2aefb514a4852f4c427b467150bbc7cdfe024528 (diff) | |
parent | 2c54d989b46284bc5ee5b43d4ba7c2762c2241ed (diff) | |
download | upstream-1378f4a4d9908dd48dcf21ee526334d86344ec68.tar.gz upstream-1378f4a4d9908dd48dcf21ee526334d86344ec68.tar.bz2 upstream-1378f4a4d9908dd48dcf21ee526334d86344ec68.zip |
Merge pull request #151 from wigyori/cc-dirtycow
CC: generic: bump kernel to 3.18.44
Diffstat (limited to 'target/linux/generic/patches-3.18/080-11-fib_trie-Push-rcu_read_lock-unlock-to-callers.patch')
-rw-r--r-- | target/linux/generic/patches-3.18/080-11-fib_trie-Push-rcu_read_lock-unlock-to-callers.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic/patches-3.18/080-11-fib_trie-Push-rcu_read_lock-unlock-to-callers.patch b/target/linux/generic/patches-3.18/080-11-fib_trie-Push-rcu_read_lock-unlock-to-callers.patch index b36bcd8167..fe55323a50 100644 --- a/target/linux/generic/patches-3.18/080-11-fib_trie-Push-rcu_read_lock-unlock-to-callers.patch +++ b/target/linux/generic/patches-3.18/080-11-fib_trie-Push-rcu_read_lock-unlock-to-callers.patch @@ -134,7 +134,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> return ret; } -@@ -919,7 +918,7 @@ void fib_del_ifaddr(struct in_ifaddr *if +@@ -923,7 +922,7 @@ no_promotions: #undef BRD1_OK } @@ -143,7 +143,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> { struct fib_result res; -@@ -929,6 +928,11 @@ static void nl_fib_lookup(struct fib_res +@@ -933,6 +932,11 @@ static void nl_fib_lookup(struct fib_res .flowi4_tos = frn->fl_tos, .flowi4_scope = frn->fl_scope, }; @@ -155,7 +155,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> frn->err = -ENOENT; if (tb) { -@@ -945,6 +949,8 @@ static void nl_fib_lookup(struct fib_res +@@ -949,6 +953,8 @@ static void nl_fib_lookup(struct fib_res } local_bh_enable(); } @@ -164,7 +164,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> } static void nl_fib_input(struct sk_buff *skb) -@@ -952,7 +958,6 @@ static void nl_fib_input(struct sk_buff +@@ -956,7 +962,6 @@ static void nl_fib_input(struct sk_buff struct net *net; struct fib_result_nl *frn; struct nlmsghdr *nlh; @@ -172,7 +172,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> u32 portid; net = sock_net(skb->sk); -@@ -967,9 +972,7 @@ static void nl_fib_input(struct sk_buff +@@ -971,9 +976,7 @@ static void nl_fib_input(struct sk_buff nlh = nlmsg_hdr(skb); frn = (struct fib_result_nl *) nlmsg_data(nlh); |