commit a842b060dd93e0b48f6ed79f0777b01b564bb561
author Dexter Rivera <riverade@google.com> Thu Jul 22 16:19:44 2021 -0700
committer Dexter Rivera <riverade@google.com> Thu Jul 22 16:19:44 2021 -0700
tree 21bafd6fbfdcb0793494c1f4839df419260215d4
parent 33d5dd8467f25c5b936efaf2c33f1c1f8288329e
parent 9980d09d8b2415107e0b355423a753dd416dc165

LTS Refresh: Merge upto 9980d09d8b2415107e0b355423a753dd416dc165 (buildnumber: 12871.1317.0) from main-R81-12871.B-cos-4.19 to release-R81-12871.B-cos-4.19.

BUG=b/186805866,b/181310975,b/181936278,b/188765490,b/190237123,b/190765754,b/191133291,b/191133633
TEST=presubmit
RELEASE_NOTE=LTS Refresh from main-R81-12871.B-cos-4.19 to release-R81-12871.B-cos-4.19

Signed-off-by: Dexter Rivera <riverade@google.com>
Change-Id: Ief0db77d018e50096323914b68b9a490ac5794fe

drivers/input/joydev.c

diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c
index 7ef6e1c..9123799 100644
--- a/drivers/input/joydev.c
+++ b/drivers/input/joydev.c
@@ -504,7 +504,7 @@
 	memcpy(joydev->keypam, keypam, len);
 
 	for (i = 0; i < joydev->nkey; i++)
-		joydev->keymap[keypam[i] - BTN_MISC] = i;
+		joydev->keymap[joydev->keypam[i] - BTN_MISC] = i;
 
  out:
 	kfree(keypam);

fs/seq_file.c

diff --git a/fs/seq_file.c b/fs/seq_file.c
index 05e58b5..e11f62b 100644
--- a/fs/seq_file.c
+++ b/fs/seq_file.c
@@ -29,6 +29,9 @@
 
 static void *seq_buf_alloc(unsigned long size)
 {
+	if (unlikely(size > MAX_RW_COUNT))
+		return NULL;
+
 	return kvmalloc(size, GFP_KERNEL_ACCOUNT);
 }