Commit 52465bce authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull char/misc driver fixes from Greg KH:
 "Here are some small char/misc driver fixes for issues that have been
  reported.

  Nothing major, highlights include:

   - gnss sync write fixes

   - uio oops fix

   - nvmem fixes

   - other minor fixes and some documentation/maintainers updates

  Full details are in the shortlog.

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

* tag 'char-misc-4.20-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  Documentation/security-bugs: Postpone fix publication in exceptional cases
  MAINTAINERS: Add Sasha as a stable branch maintainer
  gnss: sirf: fix synchronous write timeout
  gnss: serial: fix synchronous write timeout
  uio: Fix an Oops on load
  test_firmware: fix error return getting clobbered
  nvmem: core: fix regression in of_nvmem_cell_get()
  misc: atmel-ssc: Fix section annotation on atmel_ssc_get_driver_data
  drivers/misc/sgi-gru: fix Spectre v1 vulnerability
  Drivers: hv: kvp: Fix the recent regression caused by incorrect clean-up
  slimbus: ngd: remove unnecessary check
parents 4cd73195 544b03da

Documentation/admin-guide/security-bugs.rst

+11 −10
Original line number Diff line number Diff line
@@ -32,16 +32,17 @@ Disclosure and embargoed information 
The security list is not a disclosure channel.  For that, see Coordination

below.



Once a robust fix has been developed, our preference is to release the

fix in a timely fashion, treating it no differently than any of the other

thousands of changes and fixes the Linux kernel project releases every

month.



However, at the request of the reporter, we will postpone releasing the

fix for up to 5 business days after the date of the report or after the

embargo has lifted; whichever comes first.  The only exception to that

rule is if the bug is publicly known, in which case the preference is to

release the fix as soon as it's available.

Once a robust fix has been developed, the release process starts.  Fixes

for publicly known bugs are released immediately.



Although our preference is to release fixes for publicly undisclosed bugs

as soon as they become available, this may be postponed at the request of

the reporter or an affected party for up to 7 calendar days from the start

of the release process, with an exceptional extension to 14 calendar days

if it is agreed that the criticality of the bug requires more time.  The

only valid reason for deferring the publication of a fix is to accommodate

the logistics of QA and large scale rollouts which require release

coordination.



Whilst embargoed information may be shared with trusted individuals in

order to develop a fix, such information will not be published alongside

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -14085,6 +14085,7 @@ F: Documentation/devicetree/bindings/iio/proximity/vl53l0x.txt 


STABLE BRANCH

M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

M:	Sasha Levin <sashal@kernel.org>

L:	stable@vger.kernel.org

S:	Supported

F:	Documentation/process/stable-kernel-rules.rst

drivers/gnss/serial.c

+2 −1
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/of.h>

#include <linux/pm.h>

#include <linux/pm_runtime.h>

#include <linux/sched.h>

#include <linux/serdev.h>

#include <linux/slab.h>
@@ -63,7 +64,7 @@ static int gnss_serial_write_raw(struct gnss_device *gdev, 
	int ret;



	/* write is only buffered synchronously */

	ret = serdev_device_write(serdev, buf, count, 0);

	ret = serdev_device_write(serdev, buf, count, MAX_SCHEDULE_TIMEOUT);

	if (ret < 0)

		return ret;

drivers/gnss/sirf.c

+2 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/pm.h>

#include <linux/pm_runtime.h>

#include <linux/regulator/consumer.h>

#include <linux/sched.h>

#include <linux/serdev.h>

#include <linux/slab.h>

#include <linux/wait.h>
@@ -83,7 +84,7 @@ static int sirf_write_raw(struct gnss_device *gdev, const unsigned char *buf, 
	int ret;



	/* write is only buffered synchronously */

	ret = serdev_device_write(serdev, buf, count, 0);

	ret = serdev_device_write(serdev, buf, count, MAX_SCHEDULE_TIMEOUT);

	if (ret < 0)

		return ret;

drivers/hv/hv_kvp.c

+22 −4
Original line number Diff line number Diff line
@@ -353,6 +353,9 @@ static void process_ib_ipinfo(void *in_msg, void *out_msg, int op) 


		out->body.kvp_ip_val.dhcp_enabled = in->kvp_ip_val.dhcp_enabled;



		/* fallthrough */



	case KVP_OP_GET_IP_INFO:

		utf16s_to_utf8s((wchar_t *)in->kvp_ip_val.adapter_id,

				MAX_ADAPTER_ID_SIZE,

				UTF16_LITTLE_ENDIAN,
@@ -405,7 +408,11 @@ kvp_send_key(struct work_struct *dummy) 
		process_ib_ipinfo(in_msg, message, KVP_OP_SET_IP_INFO);

		break;

	case KVP_OP_GET_IP_INFO:

		/* We only need to pass on message->kvp_hdr.operation.  */

		/*

		 * We only need to pass on the info of operation, adapter_id

		 * and addr_family to the userland kvp daemon.

		 */

		process_ib_ipinfo(in_msg, message, KVP_OP_GET_IP_INFO);

		break;

	case KVP_OP_SET:

		switch (in_msg->body.kvp_set.data.value_type) {
@@ -446,9 +453,9 @@ kvp_send_key(struct work_struct *dummy) 


		}



		break;



	case KVP_OP_GET:

		/*

		 * The key is always a string - utf16 encoding.

		 */

		message->body.kvp_set.data.key_size =

			utf16s_to_utf8s(

			(wchar_t *)in_msg->body.kvp_set.data.key,
@@ -456,6 +463,17 @@ kvp_send_key(struct work_struct *dummy) 
			UTF16_LITTLE_ENDIAN,

			message->body.kvp_set.data.key,

			HV_KVP_EXCHANGE_MAX_KEY_SIZE - 1) + 1;



		break;



	case KVP_OP_GET:

		message->body.kvp_get.data.key_size =

			utf16s_to_utf8s(

			(wchar_t *)in_msg->body.kvp_get.data.key,

			in_msg->body.kvp_get.data.key_size,

			UTF16_LITTLE_ENDIAN,

			message->body.kvp_get.data.key,

			HV_KVP_EXCHANGE_MAX_KEY_SIZE - 1) + 1;

		break;



	case KVP_OP_DELETE:

CRA Git | Maintained and supported by SUSTech CRA and CCSE