From 31d077f7f98a0c8802f58de42f6b5ed69d2f3cdf Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Wed, 3 Feb 2021 02:34:15 -0800 Subject: Updated to 5.10.12 --- ...-regression-from-UDP-segmentation-support.patch | 34 ---------- 0003-iwlwifi-provide-gso_type-to-GSO-packets.patch | 52 +++++++++++++++ ...ect-NULL-dereference-on-AES-pen-proximity.patch | 76 ---------------------- PKGBUILD | 17 ++--- config | 22 ++++++- 5 files changed, 80 insertions(+), 121 deletions(-) delete mode 100644 0003-iwlwifi-Fix-regression-from-UDP-segmentation-support.patch create mode 100644 0003-iwlwifi-provide-gso_type-to-GSO-packets.patch delete mode 100644 0004-HID-wacom-Correct-NULL-dereference-on-AES-pen-proximity.patch diff --git a/0003-iwlwifi-Fix-regression-from-UDP-segmentation-support.patch b/0003-iwlwifi-Fix-regression-from-UDP-segmentation-support.patch deleted file mode 100644 index 2a46e8c..0000000 --- a/0003-iwlwifi-Fix-regression-from-UDP-segmentation-support.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 2059ba0b121bb366467fcefb35cef22cc23e2fe9 Mon Sep 17 00:00:00 2001 -From: Eric Dumazet -Date: Mon, 21 Dec 2020 20:14:02 +0100 -Subject: iwlwifi: Fix regression from UDP segmentation support - -Eric's tentative fix from -https://lore.kernel.org/linux-wireless/CANn89iJWG2n1s3j7EdpwkQQv-9dOY02V+FGYHAWguO4JiqWuJA@mail.gmail.com/ ---- - drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c -index fe1c538cd718..c27743a58f81 100644 ---- a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c -+++ b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c -@@ -833,6 +833,7 @@ iwl_mvm_tx_tso_segment(struct sk_buff *skb, unsigned int num_subframes, - - next = skb_gso_segment(skb, netdev_flags); - skb_shinfo(skb)->gso_size = mss; -+ skb_shinfo(skb)->gso_type = ipv4 ? SKB_GSO_TCPV4 : SKB_GSO_TCPV6; - if (WARN_ON_ONCE(IS_ERR(next))) - return -EINVAL; - else if (next) -@@ -855,6 +856,7 @@ iwl_mvm_tx_tso_segment(struct sk_buff *skb, unsigned int num_subframes, - - if (tcp_payload_len > mss) { - skb_shinfo(tmp)->gso_size = mss; -+ skb_shinfo(tmp)->gso_type = ipv4 ? SKB_GSO_TCPV4 : SKB_GSO_TCPV6; - } else { - if (qos) { - u8 *qc; --- -cgit v1.2.3-1-gf6bb5 - diff --git a/0003-iwlwifi-provide-gso_type-to-GSO-packets.patch b/0003-iwlwifi-provide-gso_type-to-GSO-packets.patch new file mode 100644 index 0000000..594302d --- /dev/null +++ b/0003-iwlwifi-provide-gso_type-to-GSO-packets.patch @@ -0,0 +1,52 @@ +From 545d6504ef3c786b8294ca2129111227a7bb6515 Mon Sep 17 00:00:00 2001 +From: Eric Dumazet +Date: Mon, 25 Jan 2021 07:09:49 -0800 +Subject: iwlwifi: provide gso_type to GSO packets + +commit 81a86e1bd8e7060ebba1718b284d54f1238e9bf9 upstream. + +net/core/tso.c got recent support for USO, and this broke iwlfifi +because the driver implemented a limited form of GSO. + +Providing ->gso_type allows for skb_is_gso_tcp() to provide +a correct result. + +Fixes: 3d5b459ba0e3 ("net: tso: add UDP segmentation support") +Signed-off-by: Eric Dumazet +Reported-by: Ben Greear +Tested-by: Ben Greear +Cc: Luca Coelho +Cc: Johannes Berg +Link: https://bugzilla.kernel.org/show_bug.cgi?id=209913 +Link: https://lore.kernel.org/r/20210125150949.619309-1-eric.dumazet@gmail.com +Signed-off-by: Jakub Kicinski +Cc: Robert Hancock +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c +index fe1c538cd718..7626117c01fa 100644 +--- a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c ++++ b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c +@@ -833,6 +833,7 @@ iwl_mvm_tx_tso_segment(struct sk_buff *skb, unsigned int num_subframes, + + next = skb_gso_segment(skb, netdev_flags); + skb_shinfo(skb)->gso_size = mss; ++ skb_shinfo(skb)->gso_type = ipv4 ? SKB_GSO_TCPV4 : SKB_GSO_TCPV6; + if (WARN_ON_ONCE(IS_ERR(next))) + return -EINVAL; + else if (next) +@@ -855,6 +856,8 @@ iwl_mvm_tx_tso_segment(struct sk_buff *skb, unsigned int num_subframes, + + if (tcp_payload_len > mss) { + skb_shinfo(tmp)->gso_size = mss; ++ skb_shinfo(tmp)->gso_type = ipv4 ? SKB_GSO_TCPV4 : ++ SKB_GSO_TCPV6; + } else { + if (qos) { + u8 *qc; +-- +cgit v1.2.3-1-gf6bb5 + diff --git a/0004-HID-wacom-Correct-NULL-dereference-on-AES-pen-proximity.patch b/0004-HID-wacom-Correct-NULL-dereference-on-AES-pen-proximity.patch deleted file mode 100644 index 0de03e8..0000000 --- a/0004-HID-wacom-Correct-NULL-dereference-on-AES-pen-proximity.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 85c0c0e3a81f87290db5e881af609d51021b54b7 Mon Sep 17 00:00:00 2001 -From: Jason Gerecke -Date: Thu, 21 Jan 2021 10:46:49 -0800 -Subject: HID: wacom: Correct NULL dereference on AES pen proximity - -The recent commit to fix a memory leak introduced an inadvertant NULL -pointer dereference. The `wacom_wac->pen_fifo` variable was never -intialized, resuling in a crash whenever functions tried to use it. -Since the FIFO is only used by AES pens (to buffer events from pen -proximity until the hardware reports the pen serial number) this would -have been easily overlooked without testing an AES device. - -This patch converts `wacom_wac->pen_fifo` over to a pointer (since the -call to `devres_alloc` allocates memory for us) and ensures that we assign -it to point to the allocated and initalized `pen_fifo` before the function -returns. - -Link: https://github.com/linuxwacom/input-wacom/issues/230 -Fixes: 37309f47e2f5 ("HID: wacom: Fix memory leakage caused by kfifo_alloc") -CC: stable@vger.kernel.org # v4.19+ -Signed-off-by: Jason Gerecke -Tested-by: Ping Cheng ---- - drivers/hid/wacom_sys.c | 7 ++++--- - drivers/hid/wacom_wac.h | 2 +- - 2 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c -index 9e852b4bbf92..73dafa60080f 100644 ---- a/drivers/hid/wacom_sys.c -+++ b/drivers/hid/wacom_sys.c -@@ -147,9 +147,9 @@ static int wacom_wac_pen_serial_enforce(struct hid_device *hdev, - } - - if (flush) -- wacom_wac_queue_flush(hdev, &wacom_wac->pen_fifo); -+ wacom_wac_queue_flush(hdev, wacom_wac->pen_fifo); - else if (insert) -- wacom_wac_queue_insert(hdev, &wacom_wac->pen_fifo, -+ wacom_wac_queue_insert(hdev, wacom_wac->pen_fifo, - raw_data, report_size); - - return insert && !flush; -@@ -1280,7 +1280,7 @@ static void wacom_devm_kfifo_release(struct device *dev, void *res) - static int wacom_devm_kfifo_alloc(struct wacom *wacom) - { - struct wacom_wac *wacom_wac = &wacom->wacom_wac; -- struct kfifo_rec_ptr_2 *pen_fifo = &wacom_wac->pen_fifo; -+ struct kfifo_rec_ptr_2 *pen_fifo; - int error; - - pen_fifo = devres_alloc(wacom_devm_kfifo_release, -@@ -1297,6 +1297,7 @@ static int wacom_devm_kfifo_alloc(struct wacom *wacom) - } - - devres_add(&wacom->hdev->dev, pen_fifo); -+ wacom_wac->pen_fifo = pen_fifo; - - return 0; - } -diff --git a/drivers/hid/wacom_wac.h b/drivers/hid/wacom_wac.h -index da612b6e9c77..195910dd2154 100644 ---- a/drivers/hid/wacom_wac.h -+++ b/drivers/hid/wacom_wac.h -@@ -342,7 +342,7 @@ struct wacom_wac { - struct input_dev *pen_input; - struct input_dev *touch_input; - struct input_dev *pad_input; -- struct kfifo_rec_ptr_2 pen_fifo; -+ struct kfifo_rec_ptr_2 *pen_fifo; - int pid; - int num_contacts_left; - u8 bt_features; --- -cgit v1.2.3-1-gf6bb5 - diff --git a/PKGBUILD b/PKGBUILD index 5fb6e1f..9cbb750 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -20,7 +20,7 @@ _pkgbase=linux-hardened pkgbase=linux-libre-hardened _supver=5 _majver=10 -_minver=10 +_minver=12 _gccpatchver='20201113' _gccpatchger='10.1' _gccpatchker='5.8' @@ -50,8 +50,7 @@ source=( https://github.com/anthraxx/${_pkgbase}/releases/download/${pkgver}-${_hardenedver}/${_pkgbase}-${pkgver}-${_hardenedver}.patch{,.sig} config # the main kernel config file 0002-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_special_driver-list.patch - 0003-iwlwifi-Fix-regression-from-UDP-segmentation-support.patch - 0004-HID-wacom-Correct-NULL-dereference-on-AES-pen-proximity.patch + 0003-iwlwifi-provide-gso_type-to-GSO-packets.patch kernel_gcc_patch-${_gccpatchver}.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/${_gccpatchver}.tar.gz ath9k-regdom-hack.patch raid6-default-algo.patch @@ -65,16 +64,15 @@ validpgpkeys=( ) b2sums=('86103699a6bc906e85429430df098b0ddb7cfc8c887f98b37f994498388d634554e119eadb1b15f591bdf4f463e7efb7420e3e370af0029b7ed9e988a5f26b01' 'SKIP' - '2fcab5e28db7c1c2d2464eb0544733d8800f3e92dbc2392e89b7f293d014c67282269905559366c883b3b450016ea727fcea2835c3a86b6faf0c0fb072246ebc' + '448453ffc065a067fc2132b0c83eae2b878f4e77d2924e0b94b2952473dd540c8aff46bb9cf491e641b57738e2bf29545d8d7f0a41e17bef935a1b4d0900861e' 'SKIP' - '970534b4740805ec543d6e5471044947b751e64ebdf22ea8f7cc4ac0dfa147745d73040c6ca27a8e113f1eef18fa1be1482d5784358fd9c272019c1778b76f0b' + '9031b6d007f609e2452b895f8ca545573c5d2c07e1dc228cdef458a45b9713acd2de837d0a3a39bf9ae8ae33624a3e8dacf605620311a44a590f19dcb5ea0cad' 'd8297e09f552a2d6bb24c2ba10481fd2b407057f3b24278e72a89233473460d339c83838791989773623178b5af80588fb4c484da2931f1040e313cce7ceca00' - '15d9b32ff1ad4c897b097173de259cdb89bbbf6ab0230faf4557eca511a59c1f2c76b85be30d25cf9534f91e1af43e72d072bc82dbf2219eadf772822f573d38' - '078dca48f0937ad021b1d50ba98dc1c156fb67a18b25fa079d2d35d0aa5480fb820e952c7f569cff5744cd32976a23942c2e822d1cfada8144e9a8dc9bae1d82' + '9b973fa8d55d9d68020f8d05458edfad2eea916ad0bbefcabf3e41a750aae8d9bb1c1c3820105bb785e050dd7a4343ab55c8bd97ab657520c17d2da3c18b7a99' '7f1eb5938472f57748216bd00e0c875feab99fc1c5cb89babfea467ee30ca5c8e9fc5a691efe2e602bef1ea79820c5383822d7cec354b48d23321ccda8ee8127' 'b6ef77035611139fa9a6d5b8d30570e2781bb4da483bb569884b0bd0129b62e0b82a5a6776fefe43fee801c70d39de1ea4d4c177f7cedd5ac135e3c64f7b895a' 'fde132f3705d908e6f2147c78a2193289916d72304ca5efa2229d79fc3e57a857314ce94e71425caef2f7f7b6cf87f05ef86335dc8bd4be78e7035afe608005a' - '1bca51f51972850011d25d123cb6333ebb151a5673f643d41aa9ee4050ccccf9d7fbdf3caa185dff70f74ed468cb402a1bda370b82668889a0abbf278acfbcea' + '0f4f3c9954cedf9c7b8cf6efa536e14254b008d0ed32a5332be4cbc1c2ce09ce2b5161467ae2fa872021e668a3c3d9b9f1f3d46f83331fdc5d9560e99dd43451' 'SKIP') export KBUILD_BUILD_HOST=arc4linux @@ -97,8 +95,7 @@ prepare() { # Hotfixes echo "Applying hotfixes" patch -p1 -i ../0002-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_special_driver-list.patch - patch -p1 -i ../0003-iwlwifi-Fix-regression-from-UDP-segmentation-support.patch - patch -p1 -i ../0004-HID-wacom-Correct-NULL-dereference-on-AES-pen-proximity.patch + patch -p1 -i ../0003-iwlwifi-provide-gso_type-to-GSO-packets.patch # linux hardened patch diff --git a/config b/config index 52da45c..0abcabc 100644 --- a/config +++ b/config @@ -5355,7 +5355,7 @@ CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y CONFIG_MEDIA_RADIO_SUPPORT=y # CONFIG_MEDIA_SDR_SUPPORT is not set CONFIG_MEDIA_PLATFORM_SUPPORT=y -# CONFIG_MEDIA_TEST_SUPPORT is not set +CONFIG_MEDIA_TEST_SUPPORT=y # end of Media device types CONFIG_VIDEO_DEV=m @@ -5383,6 +5383,11 @@ CONFIG_VIDEOBUF_VMALLOC=m # Media controller options # CONFIG_MEDIA_CONTROLLER_DVB=y +CONFIG_MEDIA_CONTROLLER_REQUEST_API=y + +# +# Please notice that the enabled Media controller Request API is EXPERIMENTAL +# # end of Media controller options # @@ -5678,6 +5683,7 @@ CONFIG_VIDEO_SAA7146_VV=m CONFIG_SMS_SIANO_MDTV=m CONFIG_SMS_SIANO_RC=y # CONFIG_SMS_SIANO_DEBUGFS is not set +CONFIG_VIDEO_V4L2_TPG=m CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_VIDEO_CAFE_CCIC=m CONFIG_VIDEO_CADENCE=y @@ -5692,6 +5698,15 @@ CONFIG_DVB_PLATFORM_DRIVERS=y # MMC/SDIO DVB adapters # CONFIG_SMS_SDIO_DRV=m +CONFIG_V4L_TEST_DRIVERS=y +CONFIG_VIDEO_VIMC=m +CONFIG_VIDEO_VIVID=m +CONFIG_VIDEO_VIVID_CEC=y +CONFIG_VIDEO_VIVID_MAX_DEVS=64 +CONFIG_VIDEO_VIM2M=m +CONFIG_VIDEO_VICODEC=m +CONFIG_DVB_TEST_DRIVERS=y +CONFIG_DVB_VIDTV=m # # FireWire (IEEE 1394) Adapters @@ -6029,6 +6044,11 @@ CONFIG_DVB_HELENE=m # CONFIG_DVB_CXD2099=m CONFIG_DVB_SP2=m + +# +# Tools to develop new frontends +# +CONFIG_DVB_DUMMY_FE=m # end of Media ancillary drivers # -- cgit v1.2.1