Commit a477e3a7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'char-misc-6.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc 

Pull char/misc driver fixes from Greg KH:
 "Here is a small set of char/misc and other smaller driver subsystem
  fixes for 6.6-rc6. Included in here are:

   - lots of iio driver fixes

   - binder memory leak fix

   - mcb driver fixes

   - counter driver fixes

   - firmware loader documentation fix

   - documentation update for embargoed hardware issues

  All of these have been in linux-next for over a week with no reported
  issues"

* tag 'char-misc-6.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (22 commits)
  iio: pressure: ms5611: ms5611_prom_is_valid false negative bug
  dt-bindings: iio: adc: adi,ad7292: Fix additionalProperties on channel nodes
  iio: adc: ad7192: Correct reference voltage
  iio: light: vcnl4000: Don't power on/off chip in config
  iio: addac: Kconfig: update ad74413r selections
  iio: pressure: dps310: Adjust Timeout Settings
  iio: imu: bno055: Fix missing Kconfig dependencies
  iio: adc: imx8qxp: Fix address for command buffer registers
  iio: cros_ec: fix an use-after-free in cros_ec_sensors_push_data()
  iio: irsd200: fix -Warray-bounds bug in irsd200_trigger_handler
  dt-bindings: iio: rohm,bu27010: add missing vdd-supply to example
  binder: fix memory leaks of spam and pending work
  firmware_loader: Update contact emails for ABI docs
  Documentation: embargoed-hardware-issues.rst: Clarify prenotifaction
  mcb: remove is_added flag from mcb_device struct
  coresight: tmc-etr: Disable warnings for allocation failures
  coresight: Fix run time warnings while reusing ETR buffer
  iio: admv1013: add mixer_vgate corner cases
  iio: pressure: bmp280: Fix NULL pointer exception
  iio: dac: ad3552r: Correct device IDs
  ...
parents 19fd4a91 ffd1f150

Documentation/ABI/testing/sysfs-class-firmware

+7 −7
Original line number Diff line number Diff line 
What: 		/sys/class/firmware/.../data

Date:		July 2022

KernelVersion:	5.19

Contact:	Russ Weight <russell.h.weight@intel.com>

Contact:	Russ Weight <russ.weight@linux.dev>

Description:	The data sysfs file is used for firmware-fallback and for

		firmware uploads. Cat a firmware image to this sysfs file

		after you echo 1 to the loading sysfs file. When the firmware
@@ -13,7 +13,7 @@ Description: The data sysfs file is used for firmware-fallback and for 
What: 		/sys/class/firmware/.../cancel

Date:		July 2022

KernelVersion:	5.19

Contact:	Russ Weight <russell.h.weight@intel.com>

Contact:	Russ Weight <russ.weight@linux.dev>

Description:	Write-only. For firmware uploads, write a "1" to this file to

		request that the transfer of firmware data to the lower-level

		device be canceled. This request will be rejected (EBUSY) if
@@ -23,7 +23,7 @@ Description: Write-only. For firmware uploads, write a "1" to this file to 
What: 		/sys/class/firmware/.../error

Date:		July 2022

KernelVersion:	5.19

Contact:	Russ Weight <russell.h.weight@intel.com>

Contact:	Russ Weight <russ.weight@linux.dev>

Description:	Read-only. Returns a string describing a failed firmware

		upload. This string will be in the form of <STATUS>:<ERROR>,

		where <STATUS> will be one of the status strings described
@@ -37,7 +37,7 @@ Description: Read-only. Returns a string describing a failed firmware 
What: 		/sys/class/firmware/.../loading

Date:		July 2022

KernelVersion:	5.19

Contact:	Russ Weight <russell.h.weight@intel.com>

Contact:	Russ Weight <russ.weight@linux.dev>

Description:	The loading sysfs file is used for both firmware-fallback and

		for firmware uploads. Echo 1 onto the loading file to indicate

		you are writing a firmware file to the data sysfs node. Echo
@@ -49,7 +49,7 @@ Description: The loading sysfs file is used for both firmware-fallback and 
What: 		/sys/class/firmware/.../remaining_size

Date:		July 2022

KernelVersion:	5.19

Contact:	Russ Weight <russell.h.weight@intel.com>

Contact:	Russ Weight <russ.weight@linux.dev>

Description:	Read-only. For firmware upload, this file contains the size

		of the firmware data that remains to be transferred to the

		lower-level device driver. The size value is initialized to
@@ -62,7 +62,7 @@ Description: Read-only. For firmware upload, this file contains the size 
What: 		/sys/class/firmware/.../status

Date:		July 2022

KernelVersion:	5.19

Contact:	Russ Weight <russell.h.weight@intel.com>

Contact:	Russ Weight <russ.weight@linux.dev>

Description:	Read-only. Returns a string describing the current status of

		a firmware upload. The string will be one of the following:

		idle, "receiving", "preparing", "transferring", "programming".
@@ -70,7 +70,7 @@ Description: Read-only. Returns a string describing the current status of 
What: 		/sys/class/firmware/.../timeout

Date:		July 2022

KernelVersion:	5.19

Contact:	Russ Weight <russell.h.weight@intel.com>

Contact:	Russ Weight <russ.weight@linux.dev>

Description:	This file supports the timeout mechanism for firmware

		fallback.  This file has no affect on firmware uploads. For

		more information on timeouts please see the documentation

Documentation/devicetree/bindings/iio/adc/adi,ad7292.yaml

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ patternProperties: 
    required:

      - reg



    additionalProperties: true

    additionalProperties: false



allOf:

  - $ref: /schemas/spi/spi-peripheral-props.yaml#

Documentation/devicetree/bindings/iio/light/rohm,bu27010.yaml

+1 −0
Original line number Diff line number Diff line
@@ -45,5 +45,6 @@ examples: 
      light-sensor@38 {

        compatible = "rohm,bu27010";

        reg = <0x38>;

        vdd-supply = <&vdd>;

      };

    };

Documentation/process/embargoed-hardware-issues.rst

+12 −7
Original line number Diff line number Diff line
@@ -25,15 +25,15 @@ Contact 
The Linux kernel hardware security team is separate from the regular Linux

kernel security team.



The team only handles the coordination of embargoed hardware security

The team only handles developing fixes for embargoed hardware security

issues. Reports of pure software security bugs in the Linux kernel are not

handled by this team and the reporter will be guided to contact the regular

Linux kernel security team (:ref:`Documentation/admin-guide/

<securitybugs>`) instead.



The team can be contacted by email at <hardware-security@kernel.org>. This

is a private list of security officers who will help you to coordinate an

issue according to our documented process.

is a private list of security officers who will help you to coordinate a

fix according to our documented process.



The list is encrypted and email to the list can be sent by either PGP or

S/MIME encrypted and must be signed with the reporter's PGP key or S/MIME
@@ -132,7 +132,7 @@ other hardware could be affected. 


The hardware security team will provide an incident-specific encrypted

mailing-list which will be used for initial discussion with the reporter,

further disclosure and coordination.

further disclosure, and coordination of fixes.



The hardware security team will provide the disclosing party a list of

developers (domain experts) who should be informed initially about the
@@ -209,13 +209,18 @@ five work days this is taken as silent acknowledgement. 
After acknowledgement or resolution of an objection the expert is disclosed

by the incident team and brought into the development process.



List participants may not communicate about the issue outside of the

private mailing list. List participants may not use any shared resources

(e.g. employer build farms, CI systems, etc) when working on patches.





Coordinated release

"""""""""""""""""""



The involved parties will negotiate the date and time where the embargo

ends. At that point the prepared mitigations are integrated into the

relevant kernel trees and published.

relevant kernel trees and published. There is no pre-notification process:

fixes are published in public and available to everyone at the same time.



While we understand that hardware security issues need coordinated embargo

time, the embargo time should be constrained to the minimum time which is

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -8110,7 +8110,7 @@ F: include/linux/arm_ffa.h 








FIRMWARE LOADER (request_firmware)









M:	Luis Chamberlain <mcgrof@kernel.org>









M:	Russ Weight <russell.h.weight@intel.com>









M:	Russ Weight <russ.weight@linux.dev>









L:	linux-kernel@vger.kernel.org









S:	Maintained









F:	Documentation/firmware_class/