Skip to content

Commit cf270e7

Browse files
committed
Merge tag 'char-misc-6.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char driver and Documentation fixes from Greg KH: "Here is a char driver fix and some documentation updates for 6.5-rc4 that contain the following changes: - sram/genalloc bugfix for reported problem - security-bugs.rst update based on recent discussions - embargoed-hardware-issues minor cleanups and then partial revert for the project/company lists All of these have been in linux-next for a while with no reported problems, and the documentation updates have all been reviewed by the relevant developers" * tag 'char-misc-6.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: misc/genalloc: Name subpools by of_node_full_name() Documentation: embargoed-hardware-issues.rst: add AMD to the list Documentation: embargoed-hardware-issues.rst: clean out empty and unused entries Documentation: security-bugs.rst: clarify CVE handling Documentation: security-bugs.rst: update preferences when dealing with the linux-distros group
2 parents b0b9850 + f8ea950 commit cf270e7

File tree

4 files changed

+20
-26
lines changed

4 files changed

+20
-26
lines changed

Documentation/process/embargoed-hardware-issues.rst

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,6 @@ an involved disclosed party. The current ambassadors list:
254254
Samsung Javier González <[email protected]>
255255

256256
Microsoft James Morris <[email protected]>
257-
VMware
258257
Xen Andrew Cooper <[email protected]>
259258

260259
Canonical John Johansen <[email protected]>
@@ -263,10 +262,8 @@ an involved disclosed party. The current ambassadors list:
263262
Red Hat Josh Poimboeuf <[email protected]>
264263
SUSE Jiri Kosina <[email protected]>
265264

266-
Amazon
267265
Google Kees Cook <[email protected]>
268266

269-
GCC
270267
LLVM Nick Desaulniers <[email protected]>
271268
============= ========================================================
272269

Documentation/process/security-bugs.rst

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -63,31 +63,28 @@ information submitted to the security list and any followup discussions
6363
of the report are treated confidentially even after the embargo has been
6464
lifted, in perpetuity.
6565

66-
Coordination
67-
------------
68-
69-
Fixes for sensitive bugs, such as those that might lead to privilege
70-
escalations, may need to be coordinated with the private
71-
<[email protected]> mailing list so that distribution vendors
72-
are well prepared to issue a fixed kernel upon public disclosure of the
73-
upstream fix. Distros will need some time to test the proposed patch and
74-
will generally request at least a few days of embargo, and vendor update
75-
publication prefers to happen Tuesday through Thursday. When appropriate,
76-
the security team can assist with this coordination, or the reporter can
77-
include linux-distros from the start. In this case, remember to prefix
78-
the email Subject line with "[vs]" as described in the linux-distros wiki:
79-
<http://oss-security.openwall.org/wiki/mailing-lists/distros#how-to-use-the-lists>
66+
Coordination with other groups
67+
------------------------------
68+
69+
The kernel security team strongly recommends that reporters of potential
70+
security issues NEVER contact the "linux-distros" mailing list until
71+
AFTER discussing it with the kernel security team. Do not Cc: both
72+
lists at once. You may contact the linux-distros mailing list after a
73+
fix has been agreed on and you fully understand the requirements that
74+
doing so will impose on you and the kernel community.
75+
76+
The different lists have different goals and the linux-distros rules do
77+
not contribute to actually fixing any potential security problems.
8078

8179
CVE assignment
8280
--------------
8381

84-
The security team does not normally assign CVEs, nor do we require them
85-
for reports or fixes, as this can needlessly complicate the process and
86-
may delay the bug handling. If a reporter wishes to have a CVE identifier
87-
assigned ahead of public disclosure, they will need to contact the private
88-
linux-distros list, described above. When such a CVE identifier is known
89-
before a patch is provided, it is desirable to mention it in the commit
90-
message if the reporter agrees.
82+
The security team does not assign CVEs, nor do we require them for
83+
reports or fixes, as this can needlessly complicate the process and may
84+
delay the bug handling. If a reporter wishes to have a CVE identifier
85+
assigned, they should find one by themselves, for example by contacting
86+
MITRE directly. However under no circumstances will a patch inclusion
87+
be delayed to wait for a CVE identifier to arrive.
9188

9289
Non-disclosure agreements
9390
-------------------------

drivers/misc/sram.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ static int sram_reserve_regions(struct sram_dev *sram, struct resource *res)
236236
}
237237
if (!label)
238238
block->label = devm_kasprintf(sram->dev, GFP_KERNEL,
239-
"%s", dev_name(sram->dev));
239+
"%s", of_node_full_name(child));
240240
else
241241
block->label = devm_kstrdup(sram->dev,
242242
label, GFP_KERNEL);

lib/genalloc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -895,7 +895,7 @@ struct gen_pool *of_gen_pool_get(struct device_node *np,
895895

896896
of_property_read_string(np_pool, "label", &name);
897897
if (!name)
898-
name = np_pool->name;
898+
name = of_node_full_name(np_pool);
899899
}
900900
if (pdev)
901901
pool = gen_pool_get(&pdev->dev, name);

0 commit comments

Comments
 (0)