summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiotr Gorski2018-04-18 00:53:55 +0200
committerPiotr Gorski2018-04-18 00:53:55 +0200
commit125aa945ed46869c9116eb69afa911ed1c550aac (patch)
treecbfd7a560407f4b5e24d2013563b3a556ee0ed00
parent2d6052d6fa265d8aefef8c380463fc2038ed7938 (diff)
downloadaur-125aa945ed46869c9116eb69afa911ed1c550aac.tar.gz
Add upstream patch
Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com>
Diffstat
-rw-r--r--.SRCINFO16
-rw-r--r--0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch4
-rw-r--r--0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch8
-rw-r--r--0003-Partially-revert-swiotlb-remove-various-exports.patch8
-rw-r--r--0004-Fix-vboxguest-on-guests-with-more-than-4G-RAM.patch8
-rw-r--r--0005-Revert-drm-amd-display-disable-CRTCs-with-NULL-FB-on.patch8
-rw-r--r--0006-net-aquantia-Regression-on-reset-with-1.x-firmware.patch8
-rw-r--r--0007-media-v4l2-core-fix-size-of-devnode_nums-bitarray.patch265
-rw-r--r--PKGBUILD22
9 files changed, 310 insertions, 37 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7ad49903b9c2..d6c3ff610939 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = linux-uksm
pkgver = 4.16.2
- pkgrel = 3
+ pkgrel = 4
url = https://github.com/dolohow/uksm
arch = x86_64
license = GPL2
@@ -22,6 +22,7 @@ pkgbase = linux-uksm
source = 0004-Fix-vboxguest-on-guests-with-more-than-4G-RAM.patch
source = 0005-Revert-drm-amd-display-disable-CRTCs-with-NULL-FB-on.patch
source = 0006-net-aquantia-Regression-on-reset-with-1.x-firmware.patch
+ source = 0007-media-v4l2-core-fix-size-of-devnode_nums-bitarray.patch
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
sha512sums = ab47849314b177d0eec9dbf261f33972b0d89fb92fb0650130ffa7abc2f36c0fab2d06317dc1683c51a472a9a631573a9b1e7258d6281a2ee189897827f14662
@@ -35,12 +36,13 @@ pkgbase = linux-uksm
sha512sums = 4a8b324aee4cccf3a512ad04ce1a272d14e5b05c8de90feb82075f55ea3845948d817e1b0c6f298f5816834ddd3e5ce0a0e2619866289f3c1ab8fd2f35f04f44
sha512sums = 6346b66f54652256571ef65da8e46db49a95ac5978ecd57a507c6b2a28aee70bb3ff87045ac493f54257c9965da1046a28b72cb5abb0087204d257f14b91fd74
sha512sums = 2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf
- sha512sums = 66404910e458f18ab67143a1ba41a89028fba9669995e85ec8d8c690ce718d861cbeaa45295738ab4ae03abe6e4941270586f07c2ae2a04d0def19856d15e48a
- sha512sums = 23f03a8c1a679bd6b81d7a5c4036a4201084f214abad24c24e28f5f888b7e60743340033fba01960c82cae0806fe2707596fe5e444d83a58629dafaaf73e572a
- sha512sums = c324687fc9c60ca24ebce331d9a285d3ccb83cd72d36b0b5c6ef503d17cce2955673de2f065c8937c54e9a985a5e1443343e920c44932fb144ab12eb09b00b42
- sha512sums = 9ff7e643569a6aa0a1ca092de534860e7bfc4fcec7ee8cb36c5f26a719465af7f7b780d2cec12184332bc6fa2c0b56b182d67646747d48bc5e4e2eb58ee5bb55
- sha512sums = ca5a56235fa06c26154532c96f2d535ee5000050ee85253b94d39eee28b6cf7d5cdbffc20db2c8e869dc592321fd7f262f1d250e9f90053e0ad52d76a6b42238
- sha512sums = b82360552a235a64bc68245361f0758bd4c1c6815050814f9ea28f2d7d28f57aa2b8697b5f5ee8af31e9bf13053b371cff395a2c71e334e8c0b10a7364a8831e
+ sha512sums = 5b3f97fb18c2bafb5df2fdfce98baf4c7f032bba837a608ddd83234f0a82898c73f99ff294c6517a6fd87fd48729adfa41420c5aae4589ab46c4ec3769d44f61
+ sha512sums = b6673702b10c9045355fc0a6b015b06814bacfa2326194ad16c2a20ea514665e1f5701838b3fbcfaa28034243490d7d2c1e701cde8ef80c529a8b40eea59bfc1
+ sha512sums = 2c2288db09b1925bf62de9d900cebf3ddcef8db9b99a0121103a4f6e30be444799eb607ada98a3d70379ee3e287da7583720b2c6e4db8273bbe3386cafed8133
+ sha512sums = de827e9c2e5b14ba72a69436a0a65398c49ac1e34eab77667060d81b39984f79d28c00b6e85bcc0bc7e795e6835030bac36618eda6f4101addea6a8d99aadd04
+ sha512sums = efe12cdc2de4f6056ddc5ddcb647b5df5c926ddc8a3cf686dfeb98a12574ff7ee8eba418ebcc320655550d895580df077e0c47e2ca9c87ba13e76a92a63b2df8
+ sha512sums = d98eb331263aa38938ab6c773908d5c931401eb6c8d767b13b68db0ddeac92eace8dd1baa5fa8327fa586199f2f24491a0507c4b6bf6fd0ffcee3081609d8799
+ sha512sums = 79df2211abff5c4dfb5b1b8d85e63f68ac430451dcd65989213f6c377317db163ed44f6acd1fd5be5db0b21a5deafe117a709c79ea904997e04523b44327b928
pkgname = linux-uksm
pkgdesc = Linux Kernel and modules with the UKSM.
diff --git a/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch b/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
index 804c6cd97a4d..b81c1ccac8ee 100644
--- a/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
+++ b/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
@@ -1,8 +1,8 @@
From 3a7745f6fdd71aa34dae33c3edc586363d9ece9e Mon Sep 17 00:00:00 2001
-Message-Id: <3a7745f6fdd71aa34dae33c3edc586363d9ece9e.1523790169.git.jan.steffens@gmail.com>
+Message-Id: <3a7745f6fdd71aa34dae33c3edc586363d9ece9e.1523990130.git.jan.steffens@gmail.com>
From: Serge Hallyn <serge.hallyn@canonical.com>
Date: Fri, 31 May 2013 19:12:12 +0100
-Subject: [PATCH 1/6] add sysctl to disallow unprivileged CLONE_NEWUSER by
+Subject: [PATCH 1/7] add sysctl to disallow unprivileged CLONE_NEWUSER by
default
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
diff --git a/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch b/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch
index 149d09f6a057..259f372513de 100644
--- a/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch
+++ b/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch
@@ -1,10 +1,10 @@
From 1ab88f114ddb0f614118c330196af3024f88630c Mon Sep 17 00:00:00 2001
-Message-Id: <1ab88f114ddb0f614118c330196af3024f88630c.1523790169.git.jan.steffens@gmail.com>
-In-Reply-To: <3a7745f6fdd71aa34dae33c3edc586363d9ece9e.1523790169.git.jan.steffens@gmail.com>
-References: <3a7745f6fdd71aa34dae33c3edc586363d9ece9e.1523790169.git.jan.steffens@gmail.com>
+Message-Id: <1ab88f114ddb0f614118c330196af3024f88630c.1523990130.git.jan.steffens@gmail.com>
+In-Reply-To: <3a7745f6fdd71aa34dae33c3edc586363d9ece9e.1523990130.git.jan.steffens@gmail.com>
+References: <3a7745f6fdd71aa34dae33c3edc586363d9ece9e.1523990130.git.jan.steffens@gmail.com>
From: Jim Bride <jim.bride@linux.intel.com>
Date: Mon, 6 Nov 2017 13:38:57 -0800
-Subject: [PATCH 2/6] drm/i915/edp: Only use the alternate fixed mode if it's
+Subject: [PATCH 2/7] drm/i915/edp: Only use the alternate fixed mode if it's
asked for
In commit dc911f5bd8aa ("drm/i915/edp: Allow alternate fixed mode for
diff --git a/0003-Partially-revert-swiotlb-remove-various-exports.patch b/0003-Partially-revert-swiotlb-remove-various-exports.patch
index aec2f3e245a9..e80312963055 100644
--- a/0003-Partially-revert-swiotlb-remove-various-exports.patch
+++ b/0003-Partially-revert-swiotlb-remove-various-exports.patch
@@ -1,10 +1,10 @@
From d1bc4bfbbc01a62a8b70f4018273d49b502c1511 Mon Sep 17 00:00:00 2001
-Message-Id: <d1bc4bfbbc01a62a8b70f4018273d49b502c1511.1523790169.git.jan.steffens@gmail.com>
-In-Reply-To: <3a7745f6fdd71aa34dae33c3edc586363d9ece9e.1523790169.git.jan.steffens@gmail.com>
-References: <3a7745f6fdd71aa34dae33c3edc586363d9ece9e.1523790169.git.jan.steffens@gmail.com>
+Message-Id: <d1bc4bfbbc01a62a8b70f4018273d49b502c1511.1523990130.git.jan.steffens@gmail.com>
+In-Reply-To: <3a7745f6fdd71aa34dae33c3edc586363d9ece9e.1523990130.git.jan.steffens@gmail.com>
+References: <3a7745f6fdd71aa34dae33c3edc586363d9ece9e.1523990130.git.jan.steffens@gmail.com>
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Fri, 6 Apr 2018 16:19:38 +0200
-Subject: [PATCH 3/6] Partially revert "swiotlb: remove various exports"
+Subject: [PATCH 3/7] Partially revert "swiotlb: remove various exports"
This partially reverts commit 4bd89ed39b2ab8dc4ac4b6c59b07d420b0213bec.
The proprietary NVIDIA driver needs one of the exports.
diff --git a/0004-Fix-vboxguest-on-guests-with-more-than-4G-RAM.patch b/0004-Fix-vboxguest-on-guests-with-more-than-4G-RAM.patch
index bcf2274f83f5..1ba2145c402f 100644
--- a/0004-Fix-vboxguest-on-guests-with-more-than-4G-RAM.patch
+++ b/0004-Fix-vboxguest-on-guests-with-more-than-4G-RAM.patch
@@ -1,10 +1,10 @@
From 437fda0d08ba6f5c644dd7c13a249a779ff41abd Mon Sep 17 00:00:00 2001
-Message-Id: <437fda0d08ba6f5c644dd7c13a249a779ff41abd.1523790169.git.jan.steffens@gmail.com>
-In-Reply-To: <3a7745f6fdd71aa34dae33c3edc586363d9ece9e.1523790169.git.jan.steffens@gmail.com>
-References: <3a7745f6fdd71aa34dae33c3edc586363d9ece9e.1523790169.git.jan.steffens@gmail.com>
+Message-Id: <437fda0d08ba6f5c644dd7c13a249a779ff41abd.1523990130.git.jan.steffens@gmail.com>
+In-Reply-To: <3a7745f6fdd71aa34dae33c3edc586363d9ece9e.1523990130.git.jan.steffens@gmail.com>
+References: <3a7745f6fdd71aa34dae33c3edc586363d9ece9e.1523990130.git.jan.steffens@gmail.com>
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Wed, 11 Apr 2018 21:27:44 +0200
-Subject: [PATCH 4/6] Fix vboxguest on guests with more than 4G RAM
+Subject: [PATCH 4/7] Fix vboxguest on guests with more than 4G RAM
Squashed commit of the following:
diff --git a/0005-Revert-drm-amd-display-disable-CRTCs-with-NULL-FB-on.patch b/0005-Revert-drm-amd-display-disable-CRTCs-with-NULL-FB-on.patch
index 80c0ae728188..dd3b2bd55e6e 100644
--- a/0005-Revert-drm-amd-display-disable-CRTCs-with-NULL-FB-on.patch
+++ b/0005-Revert-drm-amd-display-disable-CRTCs-with-NULL-FB-on.patch
@@ -1,10 +1,10 @@
From f144015c59359c918d30fd309ed368045b783d47 Mon Sep 17 00:00:00 2001
-Message-Id: <f144015c59359c918d30fd309ed368045b783d47.1523790169.git.jan.steffens@gmail.com>
-In-Reply-To: <3a7745f6fdd71aa34dae33c3edc586363d9ece9e.1523790169.git.jan.steffens@gmail.com>
-References: <3a7745f6fdd71aa34dae33c3edc586363d9ece9e.1523790169.git.jan.steffens@gmail.com>
+Message-Id: <f144015c59359c918d30fd309ed368045b783d47.1523990130.git.jan.steffens@gmail.com>
+In-Reply-To: <3a7745f6fdd71aa34dae33c3edc586363d9ece9e.1523990130.git.jan.steffens@gmail.com>
+References: <3a7745f6fdd71aa34dae33c3edc586363d9ece9e.1523990130.git.jan.steffens@gmail.com>
From: Harry Wentland <harry.wentland@amd.com>
Date: Thu, 12 Apr 2018 10:51:52 -0400
-Subject: [PATCH 5/6] Revert "drm/amd/display: disable CRTCs with NULL FB on
+Subject: [PATCH 5/7] Revert "drm/amd/display: disable CRTCs with NULL FB on
their primary plane (V2)"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
diff --git a/0006-net-aquantia-Regression-on-reset-with-1.x-firmware.patch b/0006-net-aquantia-Regression-on-reset-with-1.x-firmware.patch
index 863fb4d9d5a8..cc56065404e0 100644
--- a/0006-net-aquantia-Regression-on-reset-with-1.x-firmware.patch
+++ b/0006-net-aquantia-Regression-on-reset-with-1.x-firmware.patch
@@ -1,10 +1,10 @@
From 33feec41e6d35bbc679befe5ec0fb12acef18c95 Mon Sep 17 00:00:00 2001
-Message-Id: <33feec41e6d35bbc679befe5ec0fb12acef18c95.1523790169.git.jan.steffens@gmail.com>
-In-Reply-To: <3a7745f6fdd71aa34dae33c3edc586363d9ece9e.1523790169.git.jan.steffens@gmail.com>
-References: <3a7745f6fdd71aa34dae33c3edc586363d9ece9e.1523790169.git.jan.steffens@gmail.com>
+Message-Id: <33feec41e6d35bbc679befe5ec0fb12acef18c95.1523990130.git.jan.steffens@gmail.com>
+In-Reply-To: <3a7745f6fdd71aa34dae33c3edc586363d9ece9e.1523990130.git.jan.steffens@gmail.com>
+References: <3a7745f6fdd71aa34dae33c3edc586363d9ece9e.1523990130.git.jan.steffens@gmail.com>
From: Igor Russkikh <igor.russkikh@aquantia.com>
Date: Wed, 11 Apr 2018 15:23:24 +0300
-Subject: [PATCH 6/6] net: aquantia: Regression on reset with 1.x firmware
+Subject: [PATCH 6/7] net: aquantia: Regression on reset with 1.x firmware
On ASUS XG-C100C with 1.5.44 firmware a special mode called "dirty wake"
is active. With this mode when motherboard gets powered (but no poweron
diff --git a/0007-media-v4l2-core-fix-size-of-devnode_nums-bitarray.patch b/0007-media-v4l2-core-fix-size-of-devnode_nums-bitarray.patch
new file mode 100644
index 000000000000..feefdb74fabc
--- /dev/null
+++ b/0007-media-v4l2-core-fix-size-of-devnode_nums-bitarray.patch
@@ -0,0 +1,265 @@
+From ee51e737747e498594483e01daad91b06239e381 Mon Sep 17 00:00:00 2001
+Message-Id: <ee51e737747e498594483e01daad91b06239e381.1523990130.git.jan.steffens@gmail.com>
+In-Reply-To: <3a7745f6fdd71aa34dae33c3edc586363d9ece9e.1523990130.git.jan.steffens@gmail.com>
+References: <3a7745f6fdd71aa34dae33c3edc586363d9ece9e.1523990130.git.jan.steffens@gmail.com>
+From: Mauro Carvalho Chehab <mchehab@s-opensource.com>
+Date: Thu, 5 Apr 2018 06:51:15 -0300
+Subject: [PATCH 7/7] media: v4l2-core: fix size of devnode_nums[] bitarray
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The size of devnode_nums[] bit array is too short to store information
+for VFL_TYPE_TOUCH. That causes it to override other memory regions.
+
+Thankfully, on recent reports, it is overriding video_device[] array,
+trigging a WARN_ON(). Yet, it just warns about the problem, but let
+the code excecuting, with generates an OOPS:
+
+[ 43.177394] WARNING: CPU: 1 PID: 711 at drivers/media/v4l2-core/v4l2-dev.c:945 __video_register_device+0xc99/0x1090 [videodev]
+[ 43.177396] Modules linked in: hid_sensor_custom hid_sensor_als hid_sensor_incl_3d hid_sensor_rotation hid_sensor_magn_3d hid_sensor_accel_3d hid_sensor_gyro_3d hid_sensor_trigger industrialio_triggered_buffer kfifo_buf joydev hid_sensor_iio_common hid_rmi(+) rmi_core industrialio videobuf2_vmalloc videobuf2_memops videobuf2_v4l2 videobuf2_common videodev hid_multitouch media hid_sensor_hub binfmt_misc nls_iso8859_1 snd_hda_codec_hdmi arc4 snd_soc_skl snd_soc_skl_ipc snd_hda_ext_core snd_soc_sst_dsp snd_soc_sst_ipc snd_hda_codec_realtek snd_soc_acpi snd_hda_codec_generic snd_soc_core snd_compress ac97_bus snd_pcm_dmaengine snd_hda_intel snd_hda_codec intel_rapl snd_hda_core x86_pkg_temp_thermal snd_hwdep intel_powerclamp coretemp snd_pcm kvm_intel snd_seq_midi snd_seq_midi_event snd_rawmidi crct10dif_pclmul
+[ 43.177426] crc32_pclmul ghash_clmulni_intel iwlmvm pcbc mac80211 snd_seq aesni_intel iwlwifi aes_x86_64 snd_seq_device crypto_simd glue_helper cryptd snd_timer intel_cstate intel_rapl_perf input_leds serio_raw intel_wmi_thunderbolt snd wmi_bmof cfg80211 soundcore ideapad_laptop sparse_keymap idma64 virt_dma tpm_crb acpi_pad int3400_thermal acpi_thermal_rel intel_pch_thermal processor_thermal_device mac_hid int340x_thermal_zone mei_me intel_soc_dts_iosf mei intel_lpss_pci shpchp intel_lpss sch_fq_codel vfio_pci nfsd vfio_virqfd parport_pc ppdev auth_rpcgss nfs_acl lockd grace lp parport sunrpc ip_tables x_tables autofs4 hid_logitech_hidpp hid_logitech_dj hid_generic usbhid kvmgt vfio_mdev mdev vfio_iommu_type1 vfio kvm irqbypass i915 i2c_algo_bit drm_kms_helper syscopyarea sdhci_pci sysfillrect
+[ 43.177466] sysimgblt cqhci fb_sys_fops sdhci drm i2c_hid wmi hid video pinctrl_sunrisepoint pinctrl_intel
+[ 43.177474] CPU: 1 PID: 711 Comm: systemd-udevd Not tainted 4.16.0 #1
+[ 43.177475] Hardware name: LENOVO 80UE/VIUU4, BIOS 2UCN10T 10/14/2016
+[ 43.177481] RIP: 0010:__video_register_device+0xc99/0x1090 [videodev]
+[ 43.177482] RSP: 0000:ffffa5c5c231b420 EFLAGS: 00010202
+[ 43.177484] RAX: 0000000000000000 RBX: 0000000000000005 RCX: 0000000000000000
+[ 43.177485] RDX: ffffffffc0c44cc0 RSI: ffffffffffffffff RDI: ffffffffc0c44cc0
+[ 43.177486] RBP: ffffa5c5c231b478 R08: ffffffffc0c96900 R09: ffff8eda1a51f018
+[ 43.177487] R10: 0000000000000600 R11: 00000000000003b6 R12: 0000000000000000
+[ 43.177488] R13: 0000000000000005 R14: ffffffffc0c96900 R15: ffff8eda1d6d91c0
+[ 43.177489] FS: 00007fd2d8ef2480(0000) GS:ffff8eda33480000(0000) knlGS:0000000000000000
+[ 43.177490] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
+[ 43.177491] CR2: 00007ffe0a6ad01c CR3: 0000000456ae2004 CR4: 00000000003606e0
+[ 43.177492] Call Trace:
+[ 43.177498] ? devres_add+0x5f/0x70
+[ 43.177502] rmi_f54_probe+0x437/0x470 [rmi_core]
+[ 43.177505] rmi_function_probe+0x25/0x30 [rmi_core]
+[ 43.177507] driver_probe_device+0x310/0x480
+[ 43.177509] __device_attach_driver+0x86/0x100
+[ 43.177511] ? __driver_attach+0xf0/0xf0
+[ 43.177512] bus_for_each_drv+0x6b/0xb0
+[ 43.177514] __device_attach+0xdd/0x160
+[ 43.177516] device_initial_probe+0x13/0x20
+[ 43.177518] bus_probe_device+0x95/0xa0
+[ 43.177519] device_add+0x44b/0x680
+[ 43.177522] rmi_register_function+0x62/0xd0 [rmi_core]
+[ 43.177525] rmi_create_function+0x112/0x1a0 [rmi_core]
+[ 43.177527] ? rmi_driver_clear_irq_bits+0xc0/0xc0 [rmi_core]
+[ 43.177530] rmi_scan_pdt+0xca/0x1a0 [rmi_core]
+[ 43.177535] rmi_init_functions+0x5b/0x120 [rmi_core]
+[ 43.177537] rmi_driver_probe+0x152/0x3c0 [rmi_core]
+[ 43.177547] ? sysfs_create_link+0x25/0x40
+[ 43.177549] driver_probe_device+0x310/0x480
+[ 43.177551] __device_attach_driver+0x86/0x100
+[ 43.177553] ? __driver_attach+0xf0/0xf0
+[ 43.177554] bus_for_each_drv+0x6b/0xb0
+[ 43.177556] __device_attach+0xdd/0x160
+[ 43.177558] device_initial_probe+0x13/0x20
+[ 43.177560] bus_probe_device+0x95/0xa0
+[ 43.177561] device_add+0x44b/0x680
+[ 43.177564] rmi_register_transport_device+0x84/0x100 [rmi_core]
+[ 43.177568] rmi_input_configured+0xbf/0x1a0 [hid_rmi]
+[ 43.177571] ? input_allocate_device+0xdf/0xf0
+[ 43.177574] hidinput_connect+0x4a9/0x37a0 [hid]
+[ 43.177578] hid_connect+0x326/0x3d0 [hid]
+[ 43.177581] hid_hw_start+0x42/0x70 [hid]
+[ 43.177583] rmi_probe+0x115/0x510 [hid_rmi]
+[ 43.177586] hid_device_probe+0xd3/0x150 [hid]
+[ 43.177588] ? sysfs_create_link+0x25/0x40
+[ 43.177590] driver_probe_device+0x310/0x480
+[ 43.177592] __driver_attach+0xbf/0xf0
+[ 43.177593] ? driver_probe_device+0x480/0x480
+[ 43.177595] bus_for_each_dev+0x74/0xb0
+[ 43.177597] ? kmem_cache_alloc_trace+0x1a6/0x1c0
+[ 43.177599] driver_attach+0x1e/0x20
+[ 43.177600] bus_add_driver+0x167/0x260
+[ 43.177602] ? 0xffffffffc0cbc000
+[ 43.177604] driver_register+0x60/0xe0
+[ 43.177605] ? 0xffffffffc0cbc000
+[ 43.177607] __hid_register_driver+0x63/0x70 [hid]
+[ 43.177610] rmi_driver_init+0x23/0x1000 [hid_rmi]
+[ 43.177612] do_one_initcall+0x52/0x191
+[ 43.177615] ? _cond_resched+0x19/0x40
+[ 43.177617] ? kmem_cache_alloc_trace+0xa2/0x1c0
+[ 43.177619] ? do_init_module+0x27/0x209
+[ 43.177621] do_init_module+0x5f/0x209
+[ 43.177623] load_module+0x1987/0x1f10
+[ 43.177626] ? ima_post_read_file+0x96/0xa0
+[ 43.177629] SYSC_finit_module+0xfc/0x120
+[ 43.177630] ? SYSC_finit_module+0xfc/0x120
+[ 43.177632] SyS_finit_module+0xe/0x10
+[ 43.177634] do_syscall_64+0x73/0x130
+[ 43.177637] entry_SYSCALL_64_after_hwframe+0x3d/0xa2
+[ 43.177638] RIP: 0033:0x7fd2d880b839
+[ 43.177639] RSP: 002b:00007ffe0a6b2368 EFLAGS: 00000246 ORIG_RAX: 0000000000000139
+[ 43.177641] RAX: ffffffffffffffda RBX: 000055cdd86542e0 RCX: 00007fd2d880b839
+[ 43.177641] RDX: 0000000000000000 RSI: 00007fd2d84ea0e5 RDI: 0000000000000016
+[ 43.177642] RBP: 00007fd2d84ea0e5 R08: 0000000000000000 R09: 00007ffe0a6b2480
+[ 43.177643] R10: 0000000000000016 R11: 0000000000000246 R12: 0000000000000000
+[ 43.177644] R13: 000055cdd8688930 R14: 0000000000020000 R15: 000055cdd86542e0
+[ 43.177645] Code: 48 c7 c7 54 b4 c3 c0 e8 96 9d ec dd e9 d4 fb ff ff 0f 0b 41 be ea ff ff ff e9 c7 fb ff ff 0f 0b 41 be ea ff ff ff e9 ba fb ff ff <0f> 0b e9 d8 f4 ff ff 83 fa 01 0f 84 c4 02 00 00 48 83 78 68 00
+[ 43.177675] ---[ end trace d44d9bc41477c2dd ]---
+[ 43.177679] BUG: unable to handle kernel NULL pointer dereference at 0000000000000499
+[ 43.177723] IP: __video_register_device+0x1cc/0x1090 [videodev]
+[ 43.177749] PGD 0 P4D 0
+[ 43.177764] Oops: 0000 [#1] SMP PTI
+[ 43.177780] Modules linked in: hid_sensor_custom hid_sensor_als hid_sensor_incl_3d hid_sensor_rotation hid_sensor_magn_3d hid_sensor_accel_3d hid_sensor_gyro_3d hid_sensor_trigger industrialio_triggered_buffer kfifo_buf joydev hid_sensor_iio_common hid_rmi(+) rmi_core industrialio videobuf2_vmalloc videobuf2_memops videobuf2_v4l2 videobuf2_common videodev hid_multitouch media hid_sensor_hub binfmt_misc nls_iso8859_1 snd_hda_codec_hdmi arc4 snd_soc_skl snd_soc_skl_ipc snd_hda_ext_core snd_soc_sst_dsp snd_soc_sst_ipc snd_hda_codec_realtek snd_soc_acpi snd_hda_codec_generic snd_soc_core snd_compress ac97_bus snd_pcm_dmaengine snd_hda_intel snd_hda_codec intel_rapl snd_hda_core x86_pkg_temp_thermal snd_hwdep intel_powerclamp coretemp snd_pcm kvm_intel snd_seq_midi snd_seq_midi_event snd_rawmidi crct10dif_pclmul
+[ 43.178055] crc32_pclmul ghash_clmulni_intel iwlmvm pcbc mac80211 snd_seq aesni_intel iwlwifi aes_x86_64 snd_seq_device crypto_simd glue_helper cryptd snd_timer intel_cstate intel_rapl_perf input_leds serio_raw intel_wmi_thunderbolt snd wmi_bmof cfg80211 soundcore ideapad_laptop sparse_keymap idma64 virt_dma tpm_crb acpi_pad int3400_thermal acpi_thermal_rel intel_pch_thermal processor_thermal_device mac_hid int340x_thermal_zone mei_me intel_soc_dts_iosf mei intel_lpss_pci shpchp intel_lpss sch_fq_codel vfio_pci nfsd vfio_virqfd parport_pc ppdev auth_rpcgss nfs_acl lockd grace lp parport sunrpc ip_tables x_tables autofs4 hid_logitech_hidpp hid_logitech_dj hid_generic usbhid kvmgt vfio_mdev mdev vfio_iommu_type1 vfio kvm irqbypass i915 i2c_algo_bit drm_kms_helper syscopyarea sdhci_pci sysfillrect
+[ 43.178337] sysimgblt cqhci fb_sys_fops sdhci drm i2c_hid wmi hid video pinctrl_sunrisepoint pinctrl_intel
+[ 43.178380] CPU: 1 PID: 711 Comm: systemd-udevd Tainted: G W 4.16.0 #1
+[ 43.178411] Hardware name: LENOVO 80UE/VIUU4, BIOS 2UCN10T 10/14/2016
+[ 43.178441] RIP: 0010:__video_register_device+0x1cc/0x1090 [videodev]
+[ 43.178467] RSP: 0000:ffffa5c5c231b420 EFLAGS: 00010202
+[ 43.178490] RAX: ffffffffc0c44cc0 RBX: 0000000000000005 RCX: ffffffffc0c454c0
+[ 43.178519] RDX: 0000000000000001 RSI: ffff8eda1d6d9118 RDI: ffffffffc0c44cc0
+[ 43.178549] RBP: ffffa5c5c231b478 R08: ffffffffc0c96900 R09: ffff8eda1a51f018
+[ 43.178579] R10: 0000000000000600 R11: 00000000000003b6 R12: 0000000000000000
+[ 43.178608] R13: 0000000000000005 R14: ffffffffc0c96900 R15: ffff8eda1d6d91c0
+[ 43.178636] FS: 00007fd2d8ef2480(0000) GS:ffff8eda33480000(0000) knlGS:0000000000000000
+[ 43.178669] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
+[ 43.178693] CR2: 0000000000000499 CR3: 0000000456ae2004 CR4: 00000000003606e0
+[ 43.178721] Call Trace:
+[ 43.178736] ? devres_add+0x5f/0x70
+[ 43.178755] rmi_f54_probe+0x437/0x470 [rmi_core]
+[ 43.178779] rmi_function_probe+0x25/0x30 [rmi_core]
+[ 43.178805] driver_probe_device+0x310/0x480
+[ 43.178828] __device_attach_driver+0x86/0x100
+[ 43.178851] ? __driver_attach+0xf0/0xf0
+[ 43.178884] bus_for_each_drv+0x6b/0xb0
+[ 43.178904] __device_attach+0xdd/0x160
+[ 43.178925] device_initial_probe+0x13/0x20
+[ 43.178948] bus_probe_device+0x95/0xa0
+[ 43.178968] device_add+0x44b/0x680
+[ 43.178987] rmi_register_function+0x62/0xd0 [rmi_core]
+[ 43.181747] rmi_create_function+0x112/0x1a0 [rmi_core]
+[ 43.184677] ? rmi_driver_clear_irq_bits+0xc0/0xc0 [rmi_core]
+[ 43.187505] rmi_scan_pdt+0xca/0x1a0 [rmi_core]
+[ 43.190171] rmi_init_functions+0x5b/0x120 [rmi_core]
+[ 43.192809] rmi_driver_probe+0x152/0x3c0 [rmi_core]
+[ 43.195403] ? sysfs_create_link+0x25/0x40
+[ 43.198253] driver_probe_device+0x310/0x480
+[ 43.201083] __device_attach_driver+0x86/0x100
+[ 43.203800] ? __driver_attach+0xf0/0xf0
+[ 43.206503] bus_for_each_drv+0x6b/0xb0
+[ 43.209291] __device_attach+0xdd/0x160
+[ 43.212207] device_initial_probe+0x13/0x20
+[ 43.215146] bus_probe_device+0x95/0xa0
+[ 43.217885] device_add+0x44b/0x680
+[ 43.220597] rmi_register_transport_device+0x84/0x100 [rmi_core]
+[ 43.223321] rmi_input_configured+0xbf/0x1a0 [hid_rmi]
+[ 43.226051] ? input_allocate_device+0xdf/0xf0
+[ 43.228814] hidinput_connect+0x4a9/0x37a0 [hid]
+[ 43.231701] hid_connect+0x326/0x3d0 [hid]
+[ 43.234548] hid_hw_start+0x42/0x70 [hid]
+[ 43.237302] rmi_probe+0x115/0x510 [hid_rmi]
+[ 43.239862] hid_device_probe+0xd3/0x150 [hid]
+[ 43.242558] ? sysfs_create_link+0x25/0x40
+[ 43.242828] audit: type=1400 audit(1522795151.600:4): apparmor="STATUS" operation="profile_load" profile="unconfined" name="/snap/core/4206/usr/lib/snapd/snap-confine" pid=1151 comm="apparmor_parser"
+[ 43.244859] driver_probe_device+0x310/0x480
+[ 43.244862] __driver_attach+0xbf/0xf0
+[ 43.246982] audit: type=1400 audit(1522795151.600:5): apparmor="STATUS" operation="profile_load" profile="unconfined" name="/snap/core/4206/usr/lib/snapd/snap-confine//mount-namespace-capture-helper" pid=1151 comm="apparmor_parser"
+[ 43.249403] ? driver_probe_device+0x480/0x480
+[ 43.249405] bus_for_each_dev+0x74/0xb0
+[ 43.253200] audit: type=1400 audit(1522795151.600:6): apparmor="STATUS" operation="profile_load" profile="unconfined" name="/snap/core/4206/usr/lib/snapd/snap-confine//snap_update_ns" pid=1151 comm="apparmor_parser"
+[ 43.254055] ? kmem_cache_alloc_trace+0x1a6/0x1c0
+[ 43.256282] audit: type=1400 audit(1522795151.604:7): apparmor="STATUS" operation="profile_load" profile="unconfined" name="/sbin/dhclient" pid=1152 comm="apparmor_parser"
+[ 43.258436] driver_attach+0x1e/0x20
+[ 43.260875] audit: type=1400 audit(1522795151.604:8): apparmor="STATUS" operation="profile_load" profile="unconfined" name="/usr/lib/NetworkManager/nm-dhcp-client.action" pid=1152 comm="apparmor_parser"
+[ 43.263118] bus_add_driver+0x167/0x260
+[ 43.267676] audit: type=1400 audit(1522795151.604:9): apparmor="STATUS" operation="profile_load" profile="unconfined" name="/usr/lib/NetworkManager/nm-dhcp-helper" pid=1152 comm="apparmor_parser"
+[ 43.268807] ? 0xffffffffc0cbc000
+[ 43.268812] driver_register+0x60/0xe0
+[ 43.271184] audit: type=1400 audit(1522795151.604:10): apparmor="STATUS" operation="profile_load" profile="unconfined" name="/usr/lib/connman/scripts/dhclient-script" pid=1152 comm="apparmor_parser"
+[ 43.274081] ? 0xffffffffc0cbc000
+[ 43.274086] __hid_register_driver+0x63/0x70 [hid]
+[ 43.288367] rmi_driver_init+0x23/0x1000 [hid_rmi]
+[ 43.291501] do_one_initcall+0x52/0x191
+[ 43.292348] audit: type=1400 audit(1522795151.652:11): apparmor="STATUS" operation="profile_load" profile="unconfined" name="/usr/bin/man" pid=1242 comm="apparmor_parser"
+[ 43.294212] ? _cond_resched+0x19/0x40
+[ 43.300028] ? kmem_cache_alloc_trace+0xa2/0x1c0
+[ 43.303475] ? do_init_module+0x27/0x209
+[ 43.306842] do_init_module+0x5f/0x209
+[ 43.310269] load_module+0x1987/0x1f10
+[ 43.313704] ? ima_post_read_file+0x96/0xa0
+[ 43.317174] SYSC_finit_module+0xfc/0x120
+[ 43.320754] ? SYSC_finit_module+0xfc/0x120
+[ 43.324065] SyS_finit_module+0xe/0x10
+[ 43.327387] do_syscall_64+0x73/0x130
+[ 43.330909] entry_SYSCALL_64_after_hwframe+0x3d/0xa2
+[ 43.334305] RIP: 0033:0x7fd2d880b839
+[ 43.337810] RSP: 002b:00007ffe0a6b2368 EFLAGS: 00000246 ORIG_RAX: 0000000000000139
+[ 43.341259] RAX: ffffffffffffffda RBX: 000055cdd86542e0 RCX: 00007fd2d880b839
+[ 43.344613] RDX: 0000000000000000 RSI: 00007fd2d84ea0e5 RDI: 0000000000000016
+[ 43.347962] RBP: 00007fd2d84ea0e5 R08: 0000000000000000 R09: 00007ffe0a6b2480
+[ 43.351456] R10: 0000000000000016 R11: 0000000000000246 R12: 0000000000000000
+[ 43.354845] R13: 000055cdd8688930 R14: 0000000000020000 R15: 000055cdd86542e0
+[ 43.358224] Code: c7 05 ad 12 02 00 00 00 00 00 48 8d 88 00 08 00 00 eb 09 48 83 c0 08 48 39 c1 74 31 48 8b 10 48 85 d2 74 ef 49 8b b7 98 04 00 00 <48> 39 b2 98 04 00 00 75 df 48 63 92 f8 04 00 00 f0 48 0f ab 15
+[ 43.361764] RIP: __video_register_device+0x1cc/0x1090 [videodev] RSP: ffffa5c5c231b420
+[ 43.365281] CR2: 0000000000000499
+
+This patch fixes the array size and changes the WARN_ON() to return an error,
+instead of letting the Kernel to proceed with registering.
+
+Cc: stable@vger.kernel.org # For Kernel 4.16
+Fixes: 4839c58f034a ("media: v4l2-dev: convert VFL_TYPE_* into an enum")
+Reported-by: Peter Geis <pgwipeout@gmail.com>
+Reported-by: Jaak Ristioja <jaak@ristioja.ee>
+Reported-by: Michał Siemek <mihau69@gmail.com>
+Reviewed-by: Hans Verkuil <hans.verkuil@cisco.com>
+Reviewed-by: Sakari Ailus <sakari.ailus@linux.intel.com>
+Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
+---
+ drivers/media/v4l2-core/v4l2-dev.c | 8 ++++++--
+ include/media/v4l2-dev.h | 12 ++++++------
+ 2 files changed, 12 insertions(+), 8 deletions(-)
+
+diff --git a/drivers/media/v4l2-core/v4l2-dev.c b/drivers/media/v4l2-core/v4l2-dev.c
+index 0301fe426a43..1d0b2208e8fb 100644
+--- a/drivers/media/v4l2-core/v4l2-dev.c
++++ b/drivers/media/v4l2-core/v4l2-dev.c
+@@ -939,10 +939,14 @@ int __video_register_device(struct video_device *vdev,
+ #endif
+ vdev->minor = i + minor_offset;
+ vdev->num = nr;
+- devnode_set(vdev);
+
+ /* Should not happen since we thought this minor was free */
+- WARN_ON(video_device[vdev->minor] != NULL);
++ if (WARN_ON(video_device[vdev->minor])) {
++ mutex_unlock(&videodev_lock);
++ printk(KERN_ERR "video_device not empty!\n");
++ return -ENFILE;
++ }
++ devnode_set(vdev);
+ vdev->index = get_index(vdev);
+ video_device[vdev->minor] = vdev;
+ mutex_unlock(&videodev_lock);
+diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
+index 53f32022fabe..7f0bda760a58 100644
+--- a/include/media/v4l2-dev.h
++++ b/include/media/v4l2-dev.h
+@@ -33,13 +33,13 @@
+ */
+ enum vfl_devnode_type {
+ VFL_TYPE_GRABBER = 0,
+- VFL_TYPE_VBI = 1,
+- VFL_TYPE_RADIO = 2,
+- VFL_TYPE_SUBDEV = 3,
+- VFL_TYPE_SDR = 4,
+- VFL_TYPE_TOUCH = 5,
++ VFL_TYPE_VBI,
++ VFL_TYPE_RADIO,
++ VFL_TYPE_SUBDEV,
++ VFL_TYPE_SDR,
++ VFL_TYPE_TOUCH,
++ VFL_TYPE_MAX /* Shall be the last one */
+ };
+-#define VFL_TYPE_MAX VFL_TYPE_TOUCH
+
+ /**
+ * enum vfl_direction - Identifies if a &struct video_device corresponds
+--
+2.17.0
+
diff --git a/PKGBUILD b/PKGBUILD
index 5ef59c53799e..27ef144ef217 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -52,7 +52,7 @@ pkgbase=linux-uksm
# pkgname=('linux-uksm' 'linux-uksm-headers' 'linux-uksm-docs')
_srcname=linux-4.16
pkgver=4.16.2
-pkgrel=3
+pkgrel=4
arch=('x86_64')
url="https://github.com/dolohow/uksm"
license=('GPL2')
@@ -86,7 +86,8 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
'0003-Partially-revert-swiotlb-remove-various-exports.patch'
'0004-Fix-vboxguest-on-guests-with-more-than-4G-RAM.patch'
'0005-Revert-drm-amd-display-disable-CRTCs-with-NULL-FB-on.patch'
- '0006-net-aquantia-Regression-on-reset-with-1.x-firmware.patch')
+ '0006-net-aquantia-Regression-on-reset-with-1.x-firmware.patch'
+ '0007-media-v4l2-core-fix-size-of-devnode_nums-bitarray.patch')
_kernelname=${pkgbase#linux}
: ${_kernelname:=-uksm}
@@ -122,6 +123,10 @@ prepare() {
msg "Fix #58174"
patch -Np1 -i ../0006-net-aquantia-Regression-on-reset-with-1.x-firmware.patch
+ ### Fix https://bugs.archlinux.org/task/58205
+ msg "Fix #58205"
+ patch -Np1 -i ../0007-media-v4l2-core-fix-size-of-devnode_nums-bitarray.patch
+
### Patch source with UKSM
msg "Patching source with UKSM"
patch -Np1 -i ../${_uksm_patch}
@@ -394,12 +399,13 @@ sha512sums=('ab47849314b177d0eec9dbf261f33972b0d89fb92fb0650130ffa7abc2f36c0fab2
'4a8b324aee4cccf3a512ad04ce1a272d14e5b05c8de90feb82075f55ea3845948d817e1b0c6f298f5816834ddd3e5ce0a0e2619866289f3c1ab8fd2f35f04f44'
'6346b66f54652256571ef65da8e46db49a95ac5978ecd57a507c6b2a28aee70bb3ff87045ac493f54257c9965da1046a28b72cb5abb0087204d257f14b91fd74'
'2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf'
- '66404910e458f18ab67143a1ba41a89028fba9669995e85ec8d8c690ce718d861cbeaa45295738ab4ae03abe6e4941270586f07c2ae2a04d0def19856d15e48a'
- '23f03a8c1a679bd6b81d7a5c4036a4201084f214abad24c24e28f5f888b7e60743340033fba01960c82cae0806fe2707596fe5e444d83a58629dafaaf73e572a'
- 'c324687fc9c60ca24ebce331d9a285d3ccb83cd72d36b0b5c6ef503d17cce2955673de2f065c8937c54e9a985a5e1443343e920c44932fb144ab12eb09b00b42'
- '9ff7e643569a6aa0a1ca092de534860e7bfc4fcec7ee8cb36c5f26a719465af7f7b780d2cec12184332bc6fa2c0b56b182d67646747d48bc5e4e2eb58ee5bb55'
- 'ca5a56235fa06c26154532c96f2d535ee5000050ee85253b94d39eee28b6cf7d5cdbffc20db2c8e869dc592321fd7f262f1d250e9f90053e0ad52d76a6b42238'
- 'b82360552a235a64bc68245361f0758bd4c1c6815050814f9ea28f2d7d28f57aa2b8697b5f5ee8af31e9bf13053b371cff395a2c71e334e8c0b10a7364a8831e')
+ '5b3f97fb18c2bafb5df2fdfce98baf4c7f032bba837a608ddd83234f0a82898c73f99ff294c6517a6fd87fd48729adfa41420c5aae4589ab46c4ec3769d44f61'
+ 'b6673702b10c9045355fc0a6b015b06814bacfa2326194ad16c2a20ea514665e1f5701838b3fbcfaa28034243490d7d2c1e701cde8ef80c529a8b40eea59bfc1'
+ '2c2288db09b1925bf62de9d900cebf3ddcef8db9b99a0121103a4f6e30be444799eb607ada98a3d70379ee3e287da7583720b2c6e4db8273bbe3386cafed8133'
+ 'de827e9c2e5b14ba72a69436a0a65398c49ac1e34eab77667060d81b39984f79d28c00b6e85bcc0bc7e795e6835030bac36618eda6f4101addea6a8d99aadd04'
+ 'efe12cdc2de4f6056ddc5ddcb647b5df5c926ddc8a3cf686dfeb98a12574ff7ee8eba418ebcc320655550d895580df077e0c47e2ca9c87ba13e76a92a63b2df8'
+ 'd98eb331263aa38938ab6c773908d5c931401eb6c8d767b13b68db0ddeac92eace8dd1baa5fa8327fa586199f2f24491a0507c4b6bf6fd0ffcee3081609d8799'
+ '79df2211abff5c4dfb5b1b8d85e63f68ac430451dcd65989213f6c377317db163ed44f6acd1fd5be5db0b21a5deafe117a709c79ea904997e04523b44327b928')
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds