diff options
| -rw-r--r-- | 0002-ALSA-hda-Fix-potential-access-overflow-in-beep-helper.patch | 42 | ||||
| -rw-r--r-- | PKGBUILD | 9 | ||||
| -rw-r--r-- | config | 2 |
3 files changed, 4 insertions, 49 deletions
diff --git a/0002-ALSA-hda-Fix-potential-access-overflow-in-beep-helper.patch b/0002-ALSA-hda-Fix-potential-access-overflow-in-beep-helper.patch deleted file mode 100644 index 48dfbf5..0000000 --- a/0002-ALSA-hda-Fix-potential-access-overflow-in-beep-helper.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 28a3a4bec629ccb9cef64c546998052e0806cb1b Mon Sep 17 00:00:00 2001 -From: Takashi Iwai <tiwai@suse.de> -Date: Tue, 7 Apr 2020 10:36:22 +0200 -Subject: ALSA: hda: Fix potential access overflow in beep helper - -The beep control helper function blindly stores the values in two -stereo channels no matter whether the actual control is mono or -stereo. This is practically harmless, but it annoys the recently -introduced sanity check, resulting in an error when the checker is -enabled. - -This patch corrects the behavior to store only on the defined array -member. - -BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=207139 -Cc: <stable@vger.kernel.org> -Signed-off-by: Takashi Iwai <tiwai@suse.de> ---- - sound/pci/hda/hda_beep.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/sound/pci/hda/hda_beep.c b/sound/pci/hda/hda_beep.c -index f5fd62ed4df5..841523f6b88d 100644 ---- a/sound/pci/hda/hda_beep.c -+++ b/sound/pci/hda/hda_beep.c -@@ -290,8 +290,12 @@ int snd_hda_mixer_amp_switch_get_beep(struct snd_kcontrol *kcontrol, - { - struct hda_codec *codec = snd_kcontrol_chip(kcontrol); - struct hda_beep *beep = codec->beep; -+ int chs = get_amp_channels(kcontrol); -+ - if (beep && (!beep->enabled || !ctl_has_mute(kcontrol))) { -- ucontrol->value.integer.value[0] = -+ if (chs & 1) -+ ucontrol->value.integer.value[0] = beep->enabled; -+ if (chs & 2) - ucontrol->value.integer.value[1] = beep->enabled; - return 0; - } --- -cgit v1.2.3-1-gf6bb5 - @@ -14,7 +14,7 @@ pkgbase=linux _supver=5 _majver=6 -_minver=4 +_minver=5 _gccpatchver='20191217' _gccpatchger='9.1' _gccpatchker='5.5' @@ -38,7 +38,6 @@ _srcname=linux-${pkgver} source=( https://www.kernel.org/pub/linux/kernel/v${_supver}.x/${_srcname}.tar.{xz,sign} 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch - 0002-ALSA-hda-Fix-potential-access-overflow-in-beep-helper.patch graysky_bdver2-hotfix.patch kernel_gcc_patch-${_gccpatchver}.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/${_gccpatchver}.tar.gz ath9k-regdom-hack.patch @@ -51,15 +50,14 @@ validpgpkeys=( '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman ) # https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -b2sums=('b2380aea16b8ca8d4f3a5025e7772a5e250c76170955745f2c21066f27262731bdeda886cafe330a9b82502f4ffa71b463a7b025d093bf7e2c791200bc1010b0' +b2sums=('92d4ea253eb70a77ea6d891b34406d5c78422d491ea66946e87fb4f1e91b786fd67fb5bf38bc5883f929cb16b916fea2b600d4223457e603c5ca8f1ea5ba8652' 'SKIP' 'ab1fb19c67d4c107f75767581c33d9c1458b4d9fdb88f4adb41d30a36f5a2f95f1c48ef079eb87e1e6e8ce2f98b293195cb2c0f2a8ec975aa817453289158c6e' - '4d0a521668223e00d0c7a7e4359ae18a5506b65b3394f3050ea20e304cc37c2c73f757a09b70737118bffe95db23a02d4da7640a3726ce9c88966c3a8c5ceb11' '1892bd22775eac3bcc4d37f4fd30c95346bf3a0888cbbff57fd614973b525390dff2e315ce35b2e498523cceaab94ff21a80475dee8df3de4dd8fc0fab07d74e' 'd76bd0bf237ea2bb7999fd3715cb664d89148cb0ade8057d57cdb40bc0a7954336e50ee077312e5e192398b0f35f055786deb98af9130d57e60f2ea040fbb66f' '2e58bb89b247b1678355368956e67c1de51fcde97a227b2162f6771e30f17fa5520faafe7be4b6816a542e7ae10d05f64c6b6354f352c12746d4b8da632936dd' 'fde132f3705d908e6f2147c78a2193289916d72304ca5efa2229d79fc3e57a857314ce94e71425caef2f7f7b6cf87f05ef86335dc8bd4be78e7035afe608005a' - '3ad2cdd5af9220cf8865c55e3061987435c98590f4b3277e47ef3e710de833b2ab8ac3ea3ad82c396088917830ad57c1db71da956124f37b21ea038e9fb41210' + '54f82139da9b9b53121e1a7da00f94ac5c0f4c16e5f68a4d4a6ec6d96b3c261c0060280aba7e555f8a24414f41d217ef8a953221654f48a317d66766f28b802e' 'b4e1377d97ad7e8144d6e55b6d43731e3271a5aec65b65ca6d81026a95f15f549b9303fb3c6f492099ca691e3f65f4cf7f0c3aa742df03b396d7f6d81813aa95') #export KBUILD_BUILD_HOST=arc4linux @@ -79,7 +77,6 @@ prepare() { # Hotfixes echo "Applying hotfixes" patch -p1 -i ../0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch - patch -p1 -i ../0002-ALSA-hda-Fix-potential-access-overflow-in-beep-helper.patch patch -p1 -i ../sphinx-workaround.patch @@ -2566,7 +2566,7 @@ CONFIG_ALTERA_STAPL=m CONFIG_INTEL_MEI=m CONFIG_INTEL_MEI_ME=m CONFIG_INTEL_MEI_TXE=m -# CONFIG_INTEL_MEI_HDCPis not set +# CONFIG_INTEL_MEI_HDCP is not set CONFIG_VMWARE_VMCI=m # |