kernel-5.13.10-200

* Thu Aug 12 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.13.10-200]
- bpf: Fix integer overflow involving bucket_size (Tatsuhiko Yasumatsu)
- kernel-5.13.10-0 (Justin M. Forbes)
- Fix up backport of Dell XPS 9710 quirk (Justin M. Forbes)
- ASoC: Intel: sof_sdw_max98373: remove useless inits (Pierre-Louis Bossart)
- ASoC: Intel: update sof_pcm512x quirks (Pierre-Louis Bossart)
- ASoC: SOF: Intel: Use DMI string to search for adl_mx98373_rt5682 variant (jairaj arava)
- ASoC: Intel: sof_sdw: add quirk for Dell XPS 9710 (Pierre-Louis Bossart)
Resolves: rhbz#1993190,1993191

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>

4 files changed, 22 insertions, 2 deletions

diff --git a/Patchlist.changelog b/Patchlist.changelog
index fd73a2ec1..7411891ce 100644
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@@ -1,3 +1,6 @@
+https://gitlab.com/cki-project/kernel-ark/-/commit/478ca6c098cab88b5eaef871822b6a8ab7414235
+ 478ca6c098cab88b5eaef871822b6a8ab7414235 bpf: Fix integer overflow involving bucket_size
+
 https://gitlab.com/cki-project/kernel-ark/-/commit/53c4c6b56f335cb97de78ede2e2f65c5ff90df2c
  53c4c6b56f335cb97de78ede2e2f65c5ff90df2c Fix up backport of Dell XPS 9710 quirk
 
diff --git a/kernel.spec b/kernel.spec
index d9bd9170a..a8bce329b 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -2887,6 +2887,7 @@ fi
 #
 %changelog
 * Thu Aug 12 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.13.10-200]
+- bpf: Fix integer overflow involving bucket_size (Tatsuhiko Yasumatsu)
 - kernel-5.13.10-0 (Justin M. Forbes)
 - Fix up backport of Dell XPS 9710 quirk (Justin M. Forbes)
 - ASoC: Intel: sof_sdw_max98373: remove useless inits (Pierre-Louis Bossart)
diff --git a/patch-5.13-redhat.patch b/patch-5.13-redhat.patch
index cb48f05d6..2e1778e8b 100644
--- a/patch-5.13-redhat.patch
+++ b/patch-5.13-redhat.patch
@@ -42,6 +42,7 @@
  include/linux/rmi.h                                |   1 +
  include/linux/security.h                           |   5 +
  init/Kconfig                                       |   2 +-
+ kernel/bpf/hashtab.c                               |   4 +-
  kernel/crash_core.c                                |  28 +-
  kernel/module_signing.c                            |   9 +-
  security/integrity/platform_certs/load_uefi.c      |   6 +-
@@ -73,7 +74,7 @@
  tools/testing/selftests/bpf/progs/linked_vars2.c   |  55 ---
  .../selftests/bpf/progs/test_static_linked1.c      |  30 --
  .../selftests/bpf/progs/test_static_linked2.c      |  31 --
- 75 files changed, 955 insertions(+), 2364 deletions(-)
+ 76 files changed, 957 insertions(+), 2366 deletions(-)
 
 diff --git a/Documentation/admin-guide/kdump/kdump.rst b/Documentation/admin-guide/kdump/kdump.rst
 index 75a9dd98e76e..3ff3291551f9 100644
@@ -2160,6 +2161,21 @@ index a61c92066c2e..94107b1d0e3e 100644
  	select IO_WQ
  	default y
  	help
+diff --git a/kernel/bpf/hashtab.c b/kernel/bpf/hashtab.c
+index d7ebb12ffffc..49857e8cd6ce 100644
+--- a/kernel/bpf/hashtab.c
++++ b/kernel/bpf/hashtab.c
+@@ -1464,8 +1464,8 @@ __htab_map_lookup_and_delete_batch(struct bpf_map *map,
+ 	/* We cannot do copy_from_user or copy_to_user inside
+ 	 * the rcu_read_lock. Allocate enough space here.
+ 	 */
+-	keys = kvmalloc(key_size * bucket_size, GFP_USER | __GFP_NOWARN);
+-	values = kvmalloc(value_size * bucket_size, GFP_USER | __GFP_NOWARN);
++	keys = kvmalloc_array(key_size, bucket_size, GFP_USER | __GFP_NOWARN);
++	values = kvmalloc_array(value_size, bucket_size, GFP_USER | __GFP_NOWARN);
+ 	if (!keys || !values) {
+ 		ret = -ENOMEM;
+ 		goto after_loop;
 diff --git a/kernel/crash_core.c b/kernel/crash_core.c
 index 684a6061a13a..220579c0e963 100644
 --- a/kernel/crash_core.c
diff --git a/sources b/sources
index b64e841a8..e0eb571d8 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (linux-5.13.10.tar.xz) = 54dff92c44f689996568b1a0e73489592340dda4ca1e4ec2113ecce53d09ac92db39db033641ee57268d893091bfc839fc7ba6df05f8adee53604fbc4423833f
-SHA512 (kernel-abi-whitelists-5.13.10-200.tar.bz2) = 5c77be649a5a4b4df5b4fe28d8a7bd6e1333781bea19ce930284e2e60107092113f217a27f6d2a1e518684999c1954f8a516ad35ee2d18c3e36433b7e0745cff
+SHA512 (kernel-abi-whitelists-5.13.10-200.tar.bz2) = 4e5f2d12d74001a898bcb8f546e424c61c064808bacdfbabf77d4730d0d8ab990b2754e7920bf5f9c3c10c3f3b9ee9e7d5ff2a473b0070fc160ae66c32547372
 SHA512 (kernel-kabi-dw-5.13.10-200.tar.bz2) = 3b629d300a3a346f29d9de17e89b1b4cf30d968e26071e8cdb84f0c7c6ce8a80a25f3665ddd0e844afe4bfc08ece86c93b3044c83494c2b4d1b5505105973164