1 |
commit: f0e959f5890bf92e504aa6cb2b6dd923b793a19e |
2 |
Author: Mike Pagano <mpagano <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Oct 9 21:36:24 2021 +0000 |
4 |
Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 9 21:36:24 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=f0e959f5 |
7 |
|
8 |
Linux patch 4.4.288 |
9 |
|
10 |
Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org> |
11 |
|
12 |
0000_README | 4 + |
13 |
1287_linux-4.4.288.patch | 322 +++++++++++++++++++++++++++++++++++++++++++++++ |
14 |
2 files changed, 326 insertions(+) |
15 |
|
16 |
diff --git a/0000_README b/0000_README |
17 |
index 7389c23..946f1ec 100644 |
18 |
--- a/0000_README |
19 |
+++ b/0000_README |
20 |
@@ -1191,6 +1191,10 @@ Patch: 1286_linux-4.4.287.patch |
21 |
From: http://www.kernel.org |
22 |
Desc: Linux 4.4.287 |
23 |
|
24 |
+Patch: 1287_linux-4.4.288.patch |
25 |
+From: http://www.kernel.org |
26 |
+Desc: Linux 4.4.288 |
27 |
+ |
28 |
Patch: 1500_XATTR_USER_PREFIX.patch |
29 |
From: https://bugs.gentoo.org/show_bug.cgi?id=470644 |
30 |
Desc: Support for namespace user.pax.* on tmpfs. |
31 |
|
32 |
diff --git a/1287_linux-4.4.288.patch b/1287_linux-4.4.288.patch |
33 |
new file mode 100644 |
34 |
index 0000000..df2b85a |
35 |
--- /dev/null |
36 |
+++ b/1287_linux-4.4.288.patch |
37 |
@@ -0,0 +1,322 @@ |
38 |
+diff --git a/Makefile b/Makefile |
39 |
+index fc14cb0bf5e0d..823d7d08088c5 100644 |
40 |
+--- a/Makefile |
41 |
++++ b/Makefile |
42 |
+@@ -1,6 +1,6 @@ |
43 |
+ VERSION = 4 |
44 |
+ PATCHLEVEL = 4 |
45 |
+-SUBLEVEL = 287 |
46 |
++SUBLEVEL = 288 |
47 |
+ EXTRAVERSION = |
48 |
+ NAME = Blurry Fish Butt |
49 |
+ |
50 |
+diff --git a/arch/sparc/lib/iomap.c b/arch/sparc/lib/iomap.c |
51 |
+index c4d42a50ebc06..fa4abbaf27de3 100644 |
52 |
+--- a/arch/sparc/lib/iomap.c |
53 |
++++ b/arch/sparc/lib/iomap.c |
54 |
+@@ -18,8 +18,10 @@ void ioport_unmap(void __iomem *addr) |
55 |
+ EXPORT_SYMBOL(ioport_map); |
56 |
+ EXPORT_SYMBOL(ioport_unmap); |
57 |
+ |
58 |
++#ifdef CONFIG_PCI |
59 |
+ void pci_iounmap(struct pci_dev *dev, void __iomem * addr) |
60 |
+ { |
61 |
+ /* nothing to do */ |
62 |
+ } |
63 |
+ EXPORT_SYMBOL(pci_iounmap); |
64 |
++#endif |
65 |
+diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c |
66 |
+index 8e7ce9bab0db5..7120da5a03f3e 100644 |
67 |
+--- a/drivers/ata/libata-core.c |
68 |
++++ b/drivers/ata/libata-core.c |
69 |
+@@ -2077,6 +2077,25 @@ static inline u8 ata_dev_knobble(struct ata_device *dev) |
70 |
+ return ((ap->cbl == ATA_CBL_SATA) && (!ata_id_is_sata(dev->id))); |
71 |
+ } |
72 |
+ |
73 |
++static bool ata_dev_check_adapter(struct ata_device *dev, |
74 |
++ unsigned short vendor_id) |
75 |
++{ |
76 |
++ struct pci_dev *pcidev = NULL; |
77 |
++ struct device *parent_dev = NULL; |
78 |
++ |
79 |
++ for (parent_dev = dev->tdev.parent; parent_dev != NULL; |
80 |
++ parent_dev = parent_dev->parent) { |
81 |
++ if (dev_is_pci(parent_dev)) { |
82 |
++ pcidev = to_pci_dev(parent_dev); |
83 |
++ if (pcidev->vendor == vendor_id) |
84 |
++ return true; |
85 |
++ break; |
86 |
++ } |
87 |
++ } |
88 |
++ |
89 |
++ return false; |
90 |
++} |
91 |
++ |
92 |
+ static int ata_dev_config_ncq(struct ata_device *dev, |
93 |
+ char *desc, size_t desc_sz) |
94 |
+ { |
95 |
+@@ -2093,6 +2112,13 @@ static int ata_dev_config_ncq(struct ata_device *dev, |
96 |
+ snprintf(desc, desc_sz, "NCQ (not used)"); |
97 |
+ return 0; |
98 |
+ } |
99 |
++ |
100 |
++ if (dev->horkage & ATA_HORKAGE_NO_NCQ_ON_ATI && |
101 |
++ ata_dev_check_adapter(dev, PCI_VENDOR_ID_ATI)) { |
102 |
++ snprintf(desc, desc_sz, "NCQ (not used)"); |
103 |
++ return 0; |
104 |
++ } |
105 |
++ |
106 |
+ if (ap->flags & ATA_FLAG_NCQ) { |
107 |
+ hdepth = min(ap->scsi_host->can_queue, ATA_MAX_QUEUE - 1); |
108 |
+ dev->flags |= ATA_DFLAG_NCQ; |
109 |
+@@ -4270,9 +4296,11 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { |
110 |
+ { "Samsung SSD 850*", NULL, ATA_HORKAGE_NO_NCQ_TRIM | |
111 |
+ ATA_HORKAGE_ZERO_AFTER_TRIM, }, |
112 |
+ { "Samsung SSD 860*", NULL, ATA_HORKAGE_NO_NCQ_TRIM | |
113 |
+- ATA_HORKAGE_ZERO_AFTER_TRIM, }, |
114 |
++ ATA_HORKAGE_ZERO_AFTER_TRIM | |
115 |
++ ATA_HORKAGE_NO_NCQ_ON_ATI, }, |
116 |
+ { "Samsung SSD 870*", NULL, ATA_HORKAGE_NO_NCQ_TRIM | |
117 |
+- ATA_HORKAGE_ZERO_AFTER_TRIM, }, |
118 |
++ ATA_HORKAGE_ZERO_AFTER_TRIM | |
119 |
++ ATA_HORKAGE_NO_NCQ_ON_ATI, }, |
120 |
+ { "FCCT*M500*", NULL, ATA_HORKAGE_NO_NCQ_TRIM | |
121 |
+ ATA_HORKAGE_ZERO_AFTER_TRIM, }, |
122 |
+ |
123 |
+@@ -6520,6 +6548,8 @@ static int __init ata_parse_force_one(char **cur, |
124 |
+ { "ncq", .horkage_off = ATA_HORKAGE_NONCQ }, |
125 |
+ { "noncqtrim", .horkage_on = ATA_HORKAGE_NO_NCQ_TRIM }, |
126 |
+ { "ncqtrim", .horkage_off = ATA_HORKAGE_NO_NCQ_TRIM }, |
127 |
++ { "noncqati", .horkage_on = ATA_HORKAGE_NO_NCQ_ON_ATI }, |
128 |
++ { "ncqati", .horkage_off = ATA_HORKAGE_NO_NCQ_ON_ATI }, |
129 |
+ { "dump_id", .horkage_on = ATA_HORKAGE_DUMP_ID }, |
130 |
+ { "pio0", .xfer_mask = 1 << (ATA_SHIFT_PIO + 0) }, |
131 |
+ { "pio1", .xfer_mask = 1 << (ATA_SHIFT_PIO + 1) }, |
132 |
+diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c |
133 |
+index c8c6afc0ab51d..15c73ebe5efca 100644 |
134 |
+--- a/drivers/net/xen-netback/netback.c |
135 |
++++ b/drivers/net/xen-netback/netback.c |
136 |
+@@ -994,7 +994,7 @@ check_frags: |
137 |
+ * the header's copy failed, and they are |
138 |
+ * sharing a slot, send an error |
139 |
+ */ |
140 |
+- if (i == 0 && sharedslot) |
141 |
++ if (i == 0 && !first_shinfo && sharedslot) |
142 |
+ xenvif_idx_release(queue, pending_idx, |
143 |
+ XEN_NETIF_RSP_ERROR); |
144 |
+ else |
145 |
+diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c |
146 |
+index 9176fb1b16157..935add4d6f836 100644 |
147 |
+--- a/drivers/scsi/sd.c |
148 |
++++ b/drivers/scsi/sd.c |
149 |
+@@ -3146,15 +3146,16 @@ static int sd_probe(struct device *dev) |
150 |
+ } |
151 |
+ |
152 |
+ device_initialize(&sdkp->dev); |
153 |
+- sdkp->dev.parent = dev; |
154 |
++ sdkp->dev.parent = get_device(dev); |
155 |
+ sdkp->dev.class = &sd_disk_class; |
156 |
+ dev_set_name(&sdkp->dev, "%s", dev_name(dev)); |
157 |
+ |
158 |
+ error = device_add(&sdkp->dev); |
159 |
+- if (error) |
160 |
+- goto out_free_index; |
161 |
++ if (error) { |
162 |
++ put_device(&sdkp->dev); |
163 |
++ goto out; |
164 |
++ } |
165 |
+ |
166 |
+- get_device(dev); |
167 |
+ dev_set_drvdata(dev, sdkp); |
168 |
+ |
169 |
+ get_device(&sdkp->dev); /* prevent release before async_schedule */ |
170 |
+diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c |
171 |
+index 9f9992b37924a..2e4747e0aaf0b 100644 |
172 |
+--- a/fs/ext2/balloc.c |
173 |
++++ b/fs/ext2/balloc.c |
174 |
+@@ -46,10 +46,9 @@ struct ext2_group_desc * ext2_get_group_desc(struct super_block * sb, |
175 |
+ struct ext2_sb_info *sbi = EXT2_SB(sb); |
176 |
+ |
177 |
+ if (block_group >= sbi->s_groups_count) { |
178 |
+- ext2_error (sb, "ext2_get_group_desc", |
179 |
+- "block_group >= groups_count - " |
180 |
+- "block_group = %d, groups_count = %lu", |
181 |
+- block_group, sbi->s_groups_count); |
182 |
++ WARN(1, "block_group >= groups_count - " |
183 |
++ "block_group = %d, groups_count = %lu", |
184 |
++ block_group, sbi->s_groups_count); |
185 |
+ |
186 |
+ return NULL; |
187 |
+ } |
188 |
+@@ -57,10 +56,9 @@ struct ext2_group_desc * ext2_get_group_desc(struct super_block * sb, |
189 |
+ group_desc = block_group >> EXT2_DESC_PER_BLOCK_BITS(sb); |
190 |
+ offset = block_group & (EXT2_DESC_PER_BLOCK(sb) - 1); |
191 |
+ if (!sbi->s_group_desc[group_desc]) { |
192 |
+- ext2_error (sb, "ext2_get_group_desc", |
193 |
+- "Group descriptor not loaded - " |
194 |
+- "block_group = %d, group_desc = %lu, desc = %lu", |
195 |
+- block_group, group_desc, offset); |
196 |
++ WARN(1, "Group descriptor not loaded - " |
197 |
++ "block_group = %d, group_desc = %lu, desc = %lu", |
198 |
++ block_group, group_desc, offset); |
199 |
+ return NULL; |
200 |
+ } |
201 |
+ |
202 |
+diff --git a/include/linux/libata.h b/include/linux/libata.h |
203 |
+index ec49344f7555d..ae4a5a1ae3814 100644 |
204 |
+--- a/include/linux/libata.h |
205 |
++++ b/include/linux/libata.h |
206 |
+@@ -437,6 +437,7 @@ enum { |
207 |
+ ATA_HORKAGE_NO_NCQ_LOG = (1 << 23), /* don't use NCQ for log read */ |
208 |
+ ATA_HORKAGE_NOTRIM = (1 << 24), /* don't use TRIM */ |
209 |
+ ATA_HORKAGE_MAX_SEC_1024 = (1 << 25), /* Limit max sects to 1024 */ |
210 |
++ ATA_HORKAGE_NO_NCQ_ON_ATI = (1 << 27), /* Disable NCQ on ATI chipset */ |
211 |
+ |
212 |
+ /* DMA mask for user DMA control: User visible values; DO NOT |
213 |
+ renumber */ |
214 |
+diff --git a/include/net/sock.h b/include/net/sock.h |
215 |
+index 1b657a3a30b51..3671bc7b7bc16 100644 |
216 |
+--- a/include/net/sock.h |
217 |
++++ b/include/net/sock.h |
218 |
+@@ -429,8 +429,10 @@ struct sock { |
219 |
+ #if IS_ENABLED(CONFIG_CGROUP_NET_PRIO) |
220 |
+ __u32 sk_cgrp_prioidx; |
221 |
+ #endif |
222 |
++ spinlock_t sk_peer_lock; |
223 |
+ struct pid *sk_peer_pid; |
224 |
+ const struct cred *sk_peer_cred; |
225 |
++ |
226 |
+ long sk_rcvtimeo; |
227 |
+ long sk_sndtimeo; |
228 |
+ struct timer_list sk_timer; |
229 |
+diff --git a/net/core/sock.c b/net/core/sock.c |
230 |
+index 82f9a7dbea6fe..5e9ff8d9f9e35 100644 |
231 |
+--- a/net/core/sock.c |
232 |
++++ b/net/core/sock.c |
233 |
+@@ -1014,7 +1014,6 @@ set_rcvbuf: |
234 |
+ } |
235 |
+ EXPORT_SYMBOL(sock_setsockopt); |
236 |
+ |
237 |
+- |
238 |
+ static void cred_to_ucred(struct pid *pid, const struct cred *cred, |
239 |
+ struct ucred *ucred) |
240 |
+ { |
241 |
+@@ -1174,7 +1173,11 @@ int sock_getsockopt(struct socket *sock, int level, int optname, |
242 |
+ struct ucred peercred; |
243 |
+ if (len > sizeof(peercred)) |
244 |
+ len = sizeof(peercred); |
245 |
++ |
246 |
++ spin_lock(&sk->sk_peer_lock); |
247 |
+ cred_to_ucred(sk->sk_peer_pid, sk->sk_peer_cred, &peercred); |
248 |
++ spin_unlock(&sk->sk_peer_lock); |
249 |
++ |
250 |
+ if (copy_to_user(optval, &peercred, len)) |
251 |
+ return -EFAULT; |
252 |
+ goto lenout; |
253 |
+@@ -1467,9 +1470,10 @@ void sk_destruct(struct sock *sk) |
254 |
+ sk->sk_frag.page = NULL; |
255 |
+ } |
256 |
+ |
257 |
+- if (sk->sk_peer_cred) |
258 |
+- put_cred(sk->sk_peer_cred); |
259 |
++ /* We do not need to acquire sk->sk_peer_lock, we are the last user. */ |
260 |
++ put_cred(sk->sk_peer_cred); |
261 |
+ put_pid(sk->sk_peer_pid); |
262 |
++ |
263 |
+ if (likely(sk->sk_net_refcnt)) |
264 |
+ put_net(sock_net(sk)); |
265 |
+ sk_prot_free(sk->sk_prot_creator, sk); |
266 |
+@@ -2442,6 +2446,8 @@ void sock_init_data(struct socket *sock, struct sock *sk) |
267 |
+ |
268 |
+ sk->sk_peer_pid = NULL; |
269 |
+ sk->sk_peer_cred = NULL; |
270 |
++ spin_lock_init(&sk->sk_peer_lock); |
271 |
++ |
272 |
+ sk->sk_write_pending = 0; |
273 |
+ sk->sk_rcvlowat = 1; |
274 |
+ sk->sk_rcvtimeo = MAX_SCHEDULE_TIMEOUT; |
275 |
+diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c |
276 |
+index cb9911dcafdbd..242d170991b41 100644 |
277 |
+--- a/net/unix/af_unix.c |
278 |
++++ b/net/unix/af_unix.c |
279 |
+@@ -594,20 +594,42 @@ static void unix_release_sock(struct sock *sk, int embrion) |
280 |
+ |
281 |
+ static void init_peercred(struct sock *sk) |
282 |
+ { |
283 |
+- put_pid(sk->sk_peer_pid); |
284 |
+- if (sk->sk_peer_cred) |
285 |
+- put_cred(sk->sk_peer_cred); |
286 |
++ const struct cred *old_cred; |
287 |
++ struct pid *old_pid; |
288 |
++ |
289 |
++ spin_lock(&sk->sk_peer_lock); |
290 |
++ old_pid = sk->sk_peer_pid; |
291 |
++ old_cred = sk->sk_peer_cred; |
292 |
+ sk->sk_peer_pid = get_pid(task_tgid(current)); |
293 |
+ sk->sk_peer_cred = get_current_cred(); |
294 |
++ spin_unlock(&sk->sk_peer_lock); |
295 |
++ |
296 |
++ put_pid(old_pid); |
297 |
++ put_cred(old_cred); |
298 |
+ } |
299 |
+ |
300 |
+ static void copy_peercred(struct sock *sk, struct sock *peersk) |
301 |
+ { |
302 |
+- put_pid(sk->sk_peer_pid); |
303 |
+- if (sk->sk_peer_cred) |
304 |
+- put_cred(sk->sk_peer_cred); |
305 |
++ const struct cred *old_cred; |
306 |
++ struct pid *old_pid; |
307 |
++ |
308 |
++ if (sk < peersk) { |
309 |
++ spin_lock(&sk->sk_peer_lock); |
310 |
++ spin_lock_nested(&peersk->sk_peer_lock, SINGLE_DEPTH_NESTING); |
311 |
++ } else { |
312 |
++ spin_lock(&peersk->sk_peer_lock); |
313 |
++ spin_lock_nested(&sk->sk_peer_lock, SINGLE_DEPTH_NESTING); |
314 |
++ } |
315 |
++ old_pid = sk->sk_peer_pid; |
316 |
++ old_cred = sk->sk_peer_cred; |
317 |
+ sk->sk_peer_pid = get_pid(peersk->sk_peer_pid); |
318 |
+ sk->sk_peer_cred = get_cred(peersk->sk_peer_cred); |
319 |
++ |
320 |
++ spin_unlock(&sk->sk_peer_lock); |
321 |
++ spin_unlock(&peersk->sk_peer_lock); |
322 |
++ |
323 |
++ put_pid(old_pid); |
324 |
++ put_cred(old_cred); |
325 |
+ } |
326 |
+ |
327 |
+ static int unix_listen(struct socket *sock, int backlog) |
328 |
+diff --git a/tools/usb/testusb.c b/tools/usb/testusb.c |
329 |
+index 0692d99b6d8f3..18c895654e767 100644 |
330 |
+--- a/tools/usb/testusb.c |
331 |
++++ b/tools/usb/testusb.c |
332 |
+@@ -278,12 +278,6 @@ nomem: |
333 |
+ } |
334 |
+ |
335 |
+ entry->ifnum = ifnum; |
336 |
+- |
337 |
+- /* FIXME update USBDEVFS_CONNECTINFO so it tells about high speed etc */ |
338 |
+- |
339 |
+- fprintf(stderr, "%s speed\t%s\t%u\n", |
340 |
+- speed(entry->speed), entry->name, entry->ifnum); |
341 |
+- |
342 |
+ entry->next = testdevs; |
343 |
+ testdevs = entry; |
344 |
+ return 0; |
345 |
+@@ -312,6 +306,14 @@ static void *handle_testdev (void *arg) |
346 |
+ return 0; |
347 |
+ } |
348 |
+ |
349 |
++ status = ioctl(fd, USBDEVFS_GET_SPEED, NULL); |
350 |
++ if (status < 0) |
351 |
++ fprintf(stderr, "USBDEVFS_GET_SPEED failed %d\n", status); |
352 |
++ else |
353 |
++ dev->speed = status; |
354 |
++ fprintf(stderr, "%s speed\t%s\t%u\n", |
355 |
++ speed(dev->speed), dev->name, dev->ifnum); |
356 |
++ |
357 |
+ restart: |
358 |
+ for (i = 0; i < TEST_CASES; i++) { |
359 |
+ if (dev->test != -1 && dev->test != i) |