]> git.pld-linux.org Git - packages/kernel.git/blob - kernel-small_fixes.patch
- rel 2; fixes CVE-2017-6074 (local root)
[packages/kernel.git] / kernel-small_fixes.patch
1 --- linux-2.6.33/scripts/mod/modpost.c~ 2010-02-24 19:52:17.000000000 +0100
2 +++ linux-2.6.33/scripts/mod/modpost.c  2010-03-07 14:26:47.242168558 +0100
3 @@ -15,7 +15,8 @@
4  #include <stdio.h>
5  #include <ctype.h>
6  #include "modpost.h"
7 -#include "../../include/generated/autoconf.h"
8 +// PLD architectures don't use CONFIG_SYMBOL_PREFIX
9 +//#include "../../include/generated/autoconf.h"
10  #include "../../include/linux/license.h"
11  
12  /* Some toolchains use a `_' prefix for all user symbols. */
13
14 --- linux-3.0/scripts/kconfig/lxdialog/check-lxdialog.sh~       2011-07-22 04:17:23.000000000 +0200
15 +++ linux-3.0/scripts/kconfig/lxdialog/check-lxdialog.sh        2011-08-25 21:26:04.799150642 +0200
16 @@ -9,6 +9,12 @@
17                         $cc -print-file-name=lib${lib}.${ext} | grep -q /
18                         if [ $? -eq 0 ]; then
19                                 echo "-l${lib}"
20 +                               for libt in tinfow tinfo ; do
21 +                                       $cc -print-file-name=lib${libt}.${ext} | grep -q /
22 +                                       if [ $? -eq 0 ]; then
23 +                                               echo "-l${libt}"
24 +                                       fi
25 +                               done
26                                 exit
27                         fi
28                 done
29 From 5d12f71723762a39435d054d02bbf5fb87c5cd14 Mon Sep 17 00:00:00 2001
30 From: =?UTF-8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= <arekm@maven.pl>
31 Date: Mon, 6 Feb 2017 14:45:15 +0100
32 Subject: [PATCH] mac80211: Print text for disassociation reason
33 MIME-Version: 1.0
34 Content-Type: text/plain; charset=UTF-8
35 Content-Transfer-Encoding: 8bit
36
37 When disassociation happens only numeric reason is printed
38 in ieee80211_rx_mgmt_disassoc(). Add text variant, too.
39
40 Signed-off-by: Arkadiusz Miƛkiewicz <arekm@maven.pl>
41 ---
42  net/mac80211/mlme.c | 5 +++--
43  1 file changed, 3 insertions(+), 2 deletions(-)
44
45 diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
46 index 098ce9b179ee..fcf8d0aa66ec 100644
47 --- a/net/mac80211/mlme.c
48 +++ b/net/mac80211/mlme.c
49 @@ -2801,8 +2801,9 @@ static void ieee80211_rx_mgmt_disassoc(struct ieee80211_sub_if_data *sdata,
50  
51         reason_code = le16_to_cpu(mgmt->u.disassoc.reason_code);
52  
53 -       sdata_info(sdata, "disassociated from %pM (Reason: %u)\n",
54 -                  mgmt->sa, reason_code);
55 +       sdata_info(sdata, "disassociated from %pM (Reason: %u=%s)\n",
56 +                  mgmt->sa, reason_code,
57 +                  ieee80211_get_reason_code_string(reason_code));
58  
59         ieee80211_set_disassoc(sdata, 0, 0, false, NULL);
60  
61 -- 
62 2.11.0
63
64 From 5edabca9d4cff7f1f2b68f0bac55ef99d9798ba4 Mon Sep 17 00:00:00 2001
65 From: Andrey Konovalov <andreyknvl@google.com>
66 Date: Thu, 16 Feb 2017 17:22:46 +0100
67 Subject: dccp: fix freeing skb too early for IPV6_RECVPKTINFO
68
69 In the current DCCP implementation an skb for a DCCP_PKT_REQUEST packet
70 is forcibly freed via __kfree_skb in dccp_rcv_state_process if
71 dccp_v6_conn_request successfully returns.
72
73 However, if IPV6_RECVPKTINFO is set on a socket, the address of the skb
74 is saved to ireq->pktopts and the ref count for skb is incremented in
75 dccp_v6_conn_request, so skb is still in use. Nevertheless, it gets freed
76 in dccp_rcv_state_process.
77
78 Fix by calling consume_skb instead of doing goto discard and therefore
79 calling __kfree_skb.
80
81 Similar fixes for TCP:
82
83 fb7e2399ec17f1004c0e0ccfd17439f8759ede01 [TCP]: skb is unexpectedly freed.
84 0aea76d35c9651d55bbaf746e7914e5f9ae5a25d tcp: SYN packets are now
85 simply consumed
86
87 Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
88 Acked-by: Eric Dumazet <edumazet@google.com>
89 Signed-off-by: David S. Miller <davem@davemloft.net>
90 ---
91  net/dccp/input.c | 3 ++-
92  1 file changed, 2 insertions(+), 1 deletion(-)
93
94 diff --git a/net/dccp/input.c b/net/dccp/input.c
95 index ba34718..8fedc2d 100644
96 --- a/net/dccp/input.c
97 +++ b/net/dccp/input.c
98 @@ -606,7 +606,8 @@ int dccp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
99                         if (inet_csk(sk)->icsk_af_ops->conn_request(sk,
100                                                                     skb) < 0)
101                                 return 1;
102 -                       goto discard;
103 +                       consume_skb(skb);
104 +                       return 0;
105                 }
106                 if (dh->dccph_type == DCCP_PKT_RESET)
107                         goto discard;
108 -- 
109 cgit v0.12
110
This page took 0.050065 seconds and 4 git commands to generate.