Merge tag 'v5.4.264' into toradex_5.4.y

This is the 5.4.264 stable release

Conflicts:
	drivers/pci/controller/dwc/pci-imx6.c
		commit 0f31993721f92 ("PCI: imx6: Install the fault
		handler only on compatible match") overlaps with our
		not mainlined THUMB work.
		Keep both additions
	sound/soc/codecs/sgtl5000.c
		commit c062676528865 (ASoC: sgtl5000: Reset the
		CHIP_CLK_CTRL reg on remove") with a backport of a
		"fixes" commit.

1 files changed, 7 insertions, 1 deletions

diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
index 76b6676b0106..5b93150b1141 100644
--- a/drivers/gpu/drm/drm_ioctl.c
+++ b/drivers/gpu/drm/drm_ioctl.c
@@ -473,7 +473,13 @@ EXPORT_SYMBOL(drm_invalid_op);
  */
 static int drm_copy_field(char __user *buf, size_t *buf_len, const char *value)
 {
-	int len;
+	size_t len;
+
+	/* don't attempt to copy a NULL pointer */
+	if (WARN_ONCE(!value, "BUG: the value to copy was not set!")) {
+		*buf_len = 0;
+		return 0;
+	}
 
 	/* don't overflow userbuf */
 	len = strlen(value);