Skip to content

Commit 00afb18

Browse files
committed
Merge tag 'asoc-fix-v7.0-rc7' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v7.0 A somewhat larger set of fixes than I'd like unfortunatey, not from any one place but rather spread out over different drivers. We've got a bunch more fixes for the SDCA interrupt support, several relatively minor SOF fixes, a few more driver specific fixes and a couple more AMD quirks.
2 parents 082c192 + 6b6f726 commit 00afb18

360 files changed

Lines changed: 5469 additions & 1791 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.get_maintainer.ignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
Alan Cox <alan@lxorguk.ukuu.org.uk>
22
Alan Cox <root@hraefn.swansea.linux.org.uk>
33
Alyssa Rosenzweig <alyssa@rosenzweig.io>
4+
Askar Safin <safinaskar@gmail.com>
45
Christoph Hellwig <hch@lst.de>
56
Jeff Kirsher <jeffrey.t.kirsher@intel.com>
67
Marc Gonzalez <marc.w.gonzalez@free.fr>

Documentation/devicetree/bindings/auxdisplay/holtek,ht16k33.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ then:
6666
required:
6767
- refresh-rate-hz
6868

69-
additionalProperties: false
69+
unevaluatedProperties: false
7070

7171
examples:
7272
- |

Documentation/devicetree/bindings/connector/usb-connector.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,7 @@ properties:
301301
maxItems: 4
302302

303303
dependencies:
304+
pd-disable: [typec-power-opmode]
304305
sink-vdos-v1: [ sink-vdos ]
305306
sink-vdos: [ sink-vdos-v1 ]
306307

Documentation/devicetree/bindings/gpio/microchip,mpfs-gpio.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ properties:
3737
const: 2
3838

3939
"#interrupt-cells":
40-
const: 1
40+
const: 2
4141

4242
ngpios:
4343
description:
@@ -86,7 +86,7 @@ examples:
8686
gpio-controller;
8787
#gpio-cells = <2>;
8888
interrupt-controller;
89-
#interrupt-cells = <1>;
89+
#interrupt-cells = <2>;
9090
interrupts = <53>, <53>, <53>, <53>,
9191
<53>, <53>, <53>, <53>,
9292
<53>, <53>, <53>, <53>,

Documentation/devicetree/bindings/sound/ti,tas2552.yaml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ maintainers:
1212
- Baojun Xu <baojun.xu@ti.com>
1313

1414
description: >
15-
The TAS2552 can receive its reference clock via MCLK, BCLK, IVCLKIN pin or
16-
use the internal 1.8MHz. This CLKIN is used by the PLL. In addition to PLL,
15+
The TAS2552 can receive its reference clock via MCLK, BCLK, IVCLKIN pin or
16+
use the internal 1.8MHz. This CLKIN is used by the PLL. In addition to PLL,
1717
the PDM reference clock is also selectable: PLL, IVCLKIN, BCLK or MCLK.
1818
1919
For system integration the dt-bindings/sound/tas2552.h header file provides
@@ -34,14 +34,20 @@ properties:
3434
maxItems: 1
3535
description: gpio pin to enable/disable the device
3636

37+
'#sound-dai-cells':
38+
const: 0
39+
3740
required:
3841
- compatible
3942
- reg
4043
- vbat-supply
4144
- iovdd-supply
4245
- avdd-supply
4346

44-
additionalProperties: false
47+
allOf:
48+
- $ref: dai-common.yaml#
49+
50+
unevaluatedProperties: false
4551

4652
examples:
4753
- |
@@ -54,6 +60,7 @@ examples:
5460
audio-codec@41 {
5561
compatible = "ti,tas2552";
5662
reg = <0x41>;
63+
#sound-dai-cells = <0>;
5764
vbat-supply = <&reg_vbat>;
5865
iovdd-supply = <&reg_iovdd>;
5966
avdd-supply = <&reg_avdd>;

Documentation/process/security-bugs.rst

Lines changed: 139 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,138 @@ Security bugs
55

66
Linux kernel developers take security very seriously. As such, we'd
77
like to know when a security bug is found so that it can be fixed and
8-
disclosed as quickly as possible. Please report security bugs to the
9-
Linux kernel security team.
8+
disclosed as quickly as possible.
9+
10+
Preparing your report
11+
---------------------
12+
13+
Like with any bug report, a security bug report requires a lot of analysis work
14+
from the developers, so the more information you can share about the issue, the
15+
better. Please review the procedure outlined in
16+
Documentation/admin-guide/reporting-issues.rst if you are unclear about what
17+
information is helpful. The following information are absolutely necessary in
18+
**any** security bug report:
19+
20+
* **affected kernel version range**: with no version indication, your report
21+
will not be processed. A significant part of reports are for bugs that
22+
have already been fixed, so it is extremely important that vulnerabilities
23+
are verified on recent versions (development tree or latest stable
24+
version), at least by verifying that the code has not changed since the
25+
version where it was detected.
26+
27+
* **description of the problem**: a detailed description of the problem, with
28+
traces showing its manifestation, and why you consider that the observed
29+
behavior as a problem in the kernel, is necessary.
30+
31+
* **reproducer**: developers will need to be able to reproduce the problem to
32+
consider a fix as effective. This includes both a way to trigger the issue
33+
and a way to confirm it happens. A reproducer with low complexity
34+
dependencies will be needed (source code, shell script, sequence of
35+
instructions, file-system image etc). Binary-only executables are not
36+
accepted. Working exploits are extremely helpful and will not be released
37+
without consent from the reporter, unless they are already public. By
38+
definition if an issue cannot be reproduced, it is not exploitable, thus it
39+
is not a security bug.
40+
41+
* **conditions**: if the bug depends on certain configuration options,
42+
sysctls, permissions, timing, code modifications etc, these should be
43+
indicated.
44+
45+
In addition, the following information are highly desirable:
46+
47+
* **suspected location of the bug**: the file names and functions where the
48+
bug is suspected to be present are very important, at least to help forward
49+
the report to the appropriate maintainers. When not possible (for example,
50+
"system freezes each time I run this command"), the security team will help
51+
identify the source of the bug.
52+
53+
* **a proposed fix**: bug reporters who have analyzed the cause of a bug in
54+
the source code almost always have an accurate idea on how to fix it,
55+
because they spent a long time studying it and its implications. Proposing
56+
a tested fix will save maintainers a lot of time, even if the fix ends up
57+
not being the right one, because it helps understand the bug. When
58+
proposing a tested fix, please always format it in a way that can be
59+
immediately merged (see Documentation/process/submitting-patches.rst).
60+
This will save some back-and-forth exchanges if it is accepted, and you
61+
will be credited for finding and fixing this issue. Note that in this case
62+
only a ``Signed-off-by:`` tag is needed, without ``Reported-by:`` when the
63+
reporter and author are the same.
64+
65+
* **mitigations**: very often during a bug analysis, some ways of mitigating
66+
the issue appear. It is useful to share them, as they can be helpful to
67+
keep end users protected during the time it takes them to apply the fix.
68+
69+
Identifying contacts
70+
--------------------
71+
72+
The most effective way to report a security bug is to send it directly to the
73+
affected subsystem's maintainers and Cc: the Linux kernel security team. Do
74+
not send it to a public list at this stage, unless you have good reasons to
75+
consider the issue as being public or trivial to discover (e.g. result of a
76+
widely available automated vulnerability scanning tool that can be repeated by
77+
anyone).
78+
79+
If you're sending a report for issues affecting multiple parts in the kernel,
80+
even if they're fairly similar issues, please send individual messages (think
81+
that maintainers will not all work on the issues at the same time). The only
82+
exception is when an issue concerns closely related parts maintained by the
83+
exact same subset of maintainers, and these parts are expected to be fixed all
84+
at once by the same commit, then it may be acceptable to report them at once.
85+
86+
One difficulty for most first-time reporters is to figure the right list of
87+
recipients to send a report to. In the Linux kernel, all official maintainers
88+
are trusted, so the consequences of accidentally including the wrong maintainer
89+
are essentially a bit more noise for that person, i.e. nothing dramatic. As
90+
such, a suitable method to figure the list of maintainers (which kernel
91+
security officers use) is to rely on the get_maintainer.pl script, tuned to
92+
only report maintainers. This script, when passed a file name, will look for
93+
its path in the MAINTAINERS file to figure a hierarchical list of relevant
94+
maintainers. Calling it a first time with the finest level of filtering will
95+
most of the time return a short list of this specific file's maintainers::
96+
97+
$ ./scripts/get_maintainer.pl --no-l --no-r --pattern-depth 1 \
98+
drivers/example.c
99+
Developer One <dev1@example.com> (maintainer:example driver)
100+
Developer Two <dev2@example.org> (maintainer:example driver)
101+
102+
These two maintainers should then receive the message. If the command does not
103+
return anything, it means the affected file is part of a wider subsystem, so we
104+
should be less specific::
105+
106+
$ ./scripts/get_maintainer.pl --no-l --no-r drivers/example.c
107+
Developer One <dev1@example.com> (maintainer:example subsystem)
108+
Developer Two <dev2@example.org> (maintainer:example subsystem)
109+
Developer Three <dev3@example.com> (maintainer:example subsystem [GENERAL])
110+
Developer Four <dev4@example.org> (maintainer:example subsystem [GENERAL])
111+
112+
Here, picking the first, most specific ones, is sufficient. When the list is
113+
long, it is possible to produce a comma-delimited e-mail address list on a
114+
single line suitable for use in the To: field of a mailer like this::
115+
116+
$ ./scripts/get_maintainer.pl --no-tree --no-l --no-r --no-n --m \
117+
--no-git-fallback --no-substatus --no-rolestats --no-multiline \
118+
--pattern-depth 1 drivers/example.c
119+
dev1@example.com, dev2@example.org
120+
121+
or this for the wider list::
122+
123+
$ ./scripts/get_maintainer.pl --no-tree --no-l --no-r --no-n --m \
124+
--no-git-fallback --no-substatus --no-rolestats --no-multiline \
125+
drivers/example.c
126+
dev1@example.com, dev2@example.org, dev3@example.com, dev4@example.org
127+
128+
If at this point you're still facing difficulties spotting the right
129+
maintainers, **and only in this case**, it's possible to send your report to
130+
the Linux kernel security team only. Your message will be triaged, and you
131+
will receive instructions about whom to contact, if needed. Your message may
132+
equally be forwarded as-is to the relevant maintainers.
133+
134+
Sending the report
135+
------------------
136+
137+
Reports are to be sent over e-mail exclusively. Please use a working e-mail
138+
address, preferably the same that you want to appear in ``Reported-by`` tags
139+
if any. If unsure, send your report to yourself first.
10140

11141
The security team and maintainers almost always require additional
12142
information beyond what was initially provided in a report and rely on
@@ -18,20 +148,12 @@ run additional tests. Reports where the reporter does not respond promptly
18148
or cannot effectively discuss their findings may be abandoned if the
19149
communication does not quickly improve.
20150

21-
As it is with any bug, the more information provided the easier it
22-
will be to diagnose and fix. Please review the procedure outlined in
23-
'Documentation/admin-guide/reporting-issues.rst' if you are unclear about what
24-
information is helpful. Any exploit code is very helpful and will not
25-
be released without consent from the reporter unless it has already been
26-
made public.
27-
151+
The report must be sent to maintainers, with the security team in ``Cc:``.
28152
The Linux kernel security team can be contacted by email at
29153
<security@kernel.org>. This is a private list of security officers
30-
who will help verify the bug report and develop and release a fix.
31-
If you already have a fix, please include it with your report, as
32-
that can speed up the process considerably. It is possible that the
33-
security team will bring in extra help from area maintainers to
34-
understand and fix the security vulnerability.
154+
who will help verify the bug report and assist developers working on a fix.
155+
It is possible that the security team will bring in extra help from area
156+
maintainers to understand and fix the security vulnerability.
35157

36158
Please send **plain text** emails without attachments where possible.
37159
It is much harder to have a context-quoted discussion about a complex
@@ -42,7 +164,9 @@ reproduction steps, and follow it with a proposed fix, all in plain text.
42164
Markdown, HTML and RST formatted reports are particularly frowned upon since
43165
they're quite hard to read for humans and encourage to use dedicated viewers,
44166
sometimes online, which by definition is not acceptable for a confidential
45-
security report.
167+
security report. Note that some mailers tend to mangle formatting of plain
168+
text by default, please consult Documentation/process/email-clients.rst for
169+
more info.
46170

47171
Disclosure and embargoed information
48172
------------------------------------

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
VERSION = 7
33
PATCHLEVEL = 0
44
SUBLEVEL = 0
5-
EXTRAVERSION = -rc6
5+
EXTRAVERSION = -rc7
66
NAME = Baby Opossum Posse
77

88
# *DOCUMENTATION*

arch/arm64/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,7 @@ config ARM64
252252
select HAVE_RSEQ
253253
select HAVE_RUST if RUSTC_SUPPORTS_ARM64
254254
select HAVE_STACKPROTECTOR
255+
select HAVE_STATIC_CALL if CFI
255256
select HAVE_SYSCALL_TRACEPOINTS
256257
select HAVE_KPROBES
257258
select HAVE_KRETPROBES
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
/* SPDX-License-Identifier: GPL-2.0 */
2+
#ifndef _ASM_STATIC_CALL_H
3+
#define _ASM_STATIC_CALL_H
4+
5+
#define __ARCH_DEFINE_STATIC_CALL_TRAMP(name, target) \
6+
asm(" .pushsection .static_call.text, \"ax\" \n" \
7+
" .align 4 \n" \
8+
" .globl " name " \n" \
9+
name ": \n" \
10+
" hint 34 /* BTI C */ \n" \
11+
" adrp x16, 1f \n" \
12+
" ldr x16, [x16, :lo12:1f] \n" \
13+
" br x16 \n" \
14+
" .type " name ", %function \n" \
15+
" .size " name ", . - " name " \n" \
16+
" .popsection \n" \
17+
" .pushsection .rodata, \"a\" \n" \
18+
" .align 3 \n" \
19+
"1: .quad " target " \n" \
20+
" .popsection \n")
21+
22+
#define ARCH_DEFINE_STATIC_CALL_TRAMP(name, func) \
23+
__ARCH_DEFINE_STATIC_CALL_TRAMP(STATIC_CALL_TRAMP_STR(name), #func)
24+
25+
#define ARCH_DEFINE_STATIC_CALL_NULL_TRAMP(name) \
26+
ARCH_DEFINE_STATIC_CALL_TRAMP(name, __static_call_return0)
27+
28+
#define ARCH_DEFINE_STATIC_CALL_RET0_TRAMP(name) \
29+
ARCH_DEFINE_STATIC_CALL_TRAMP(name, __static_call_return0)
30+
31+
#endif /* _ASM_STATIC_CALL_H */

arch/arm64/kernel/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ obj-$(CONFIG_MODULES) += module.o module-plts.o
4646
obj-$(CONFIG_PERF_EVENTS) += perf_regs.o perf_callchain.o
4747
obj-$(CONFIG_HARDLOCKUP_DETECTOR_PERF) += watchdog_hld.o
4848
obj-$(CONFIG_HAVE_HW_BREAKPOINT) += hw_breakpoint.o
49+
obj-$(CONFIG_HAVE_STATIC_CALL) += static_call.o
4950
obj-$(CONFIG_CPU_PM) += sleep.o suspend.o
5051
obj-$(CONFIG_KGDB) += kgdb.o
5152
obj-$(CONFIG_EFI) += efi.o efi-rt-wrapper.o

0 commit comments

Comments
 (0)