From patchwork Tue Aug 17 17:17:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kamal Mostafa X-Patchwork-Id: 1517773 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=JL93c+fR; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GpyQY3bkXz9sSn; Wed, 18 Aug 2021 03:17:41 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1mG2iR-0006Us-VV; Tue, 17 Aug 2021 17:17:31 +0000 Received: from smtp-relay-canonical-0.internal ([10.131.114.83] helo=smtp-relay-canonical-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1mG2iL-0006Um-G5 for kernel-team@lists.ubuntu.com; Tue, 17 Aug 2021 17:17:25 +0000 Received: from ascalon (unknown [192.188.8.63]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp-relay-canonical-0.canonical.com (Postfix) with ESMTPSA id 4A0703F0A4 for ; Tue, 17 Aug 2021 17:17:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1629220645; bh=+EXfMNuNGZ22q3oZAdORcG/plS3C9PAiSiQ+RltSDhc=; h=From:To:Subject:Date:Message-Id; b=JL93c+fRDm7hzK61no3+apoCqFsNe9jekuisHmAsswGaqiZkfkNXwhb3TWr5Pjlss Qu+YbUAtTUD47Dlzpy3dno4/kgbxCEYunirDmZZXTN5CN6RJOjtJVgkALaEvCKcR5A jPsLrrRP0lXborKv6fySj+NqjTgpVOdpW3y5nh6kxc7+Pc9EBxYd+5ngOZaKNrOcGM OR+ohUGInnansfXGchz8uv7zTminThcB1pHgmQY5zZAV3L9kMc+xtwMSv0Q5orN1ho 7rt+D6Tn2G+V25ojlzxkOxBsSDqcqlMadZtdhJ7a2H45+tGCBXmAm4uHjVOz16YqhU 1swKut77horNw== Received: from kamal by ascalon with local (Exim 4.90_1) (envelope-from ) id 1mG2i9-0007ng-JB for kernel-team@lists.ubuntu.com; Tue, 17 Aug 2021 10:17:13 -0700 From: Kamal Mostafa To: kernel-team@lists.ubuntu.com Subject: [SRU][Bionic][PULL] Bionic upstream stable patchset 2021-08-17 Date: Tue, 17 Aug 2021 10:17:12 -0700 Message-Id: <20210817171712.29862-1-kamal@canonical.com> X-Mailer: git-send-email 2.17.1 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" This pull request (40 commits) includes the following Bionic stable patchsets: Bionic update: upstream stable patchset 2021-08-17 Ported from the following upstream stable releases: v4.14.242, v4.19.201 https://bugs.launchpad.net/bugs/1940315 -Kamal --- The following changes since commit 7f5e7e3c6f6e2d9654ce88a1cc9bf649e7b56392: UBUNTU: upstream stable to v4.14.241, v4.19.200 (2021-08-17 09:35:46 -0700) are available in the Git repository at: git://kernel.ubuntu.com/ubuntu-stable/ubuntu-stable-bionic.git tags/bionic-stable-2021-08-17 for you to fetch changes up to 442f688a94f2171beefd754c8f5a526bcac51adc: UBUNTU: upstream stable to v4.14.242, v4.19.201 (2021-08-17 09:58:59 -0700) ---------------------------------------------------------------- Dan Carpenter (1): can: hi311x: fix a signedness bug in hi3110_cmd() Desmond Cheong Zhi Xi (3): hfs: add missing clean-up in hfs_fill_super hfs: fix high memory mapping in hfs_bnode_read hfs: add lock nesting notation to hfs_find_init Eric Dumazet (3): net: annotate data race around sk_ll_usec virtio_net: Do not pull payload in skb->head gro: ensure frag0 meets IP header alignment Florian Westphal (1): netfilter: conntrack: adjust stop timestamp to real expiry value Greg Kroah-Hartman (1): selftest: fix build error in tools/testing/selftests/vm/userfaultfd.c Hoang Le (1): tipc: fix sleeping in tipc accept routine Jan Kiszka (1): x86/asm: Ensure asm/proto.h can be included stand-alone Jedrzej Jagielski (1): i40e: Fix log TC creation failure when max num of queues is exceeded Jens Axboe (1): net: split out functions related to registering inflight socket files Jiapeng Chong (1): mlx4: Fix missing error code in mlx4_load_one() Juergen Gross (1): x86/kvm: fix vcpu-id indexed array sizes Junxiao Bi (2): ocfs2: fix zero out valid data ocfs2: issue zeroout to EOF blocks Kamal Mostafa (2): UBUNTU: [Config] updateconfigs for UNIX_SCM UBUNTU: upstream stable to v4.14.242, v4.19.201 Krzysztof Kozlowski (1): nfc: nfcsim: fix use after free during module unload Lukasz Cieplicki (1): i40e: Add additional info to PHY type error Maor Gottlieb (1): net/mlx5: Fix flow table chaining Marcelo Ricardo Leitner (1): sctp: fix return value check in __sctp_rcv_asconf_lookup Maxim Levitsky (1): KVM: x86: determine if an exception has an error code only when injecting it. Miklos Szeredi (1): af_unix: fix garbage collect vs MSG_PEEK Nguyen Dinh Phi (1): cfg80211: Fix possible memory leak in function cfg80211_bss_update Pablo Neira Ayuso (1): netfilter: nft_nat: allow to specify layer 4 protocol NAT only Paul Jakma (1): NIU: fix incorrect error return, missed in previous revert Pavel Skripkin (5): can: mcba_usb_start(): add missing urb->transfer_dma initialization can: usb_8dev: fix memory leak can: ems_usb: fix memory leak can: esd_usb2: fix memory leak net: llc: fix skb_over_panic Sudeep Holla (1): ARM: dts: versatile: Fix up interrupt controller node names Wang Hai (2): tulip: windbond-840: Fix missing pci_disable_device() in probe and remove sis900: Fix missing pci_disable_device() in probe and remove Xin Long (1): sctp: move 198 addresses from unusable to private scope Yang Yingliang (2): net/802/mrp: fix memleak in mrp_request_join() net/802/garp: fix memleak in garp_request_join() Ziyang Xuan (1): can: raw: raw_setsockopt(): fix raw_rcv panic for sock UAF arch/arm/boot/dts/versatile-ab.dts | 5 +- arch/arm/boot/dts/versatile-pb.dts | 2 +- arch/x86/include/asm/proto.h | 2 + arch/x86/kvm/ioapic.c | 2 +- arch/x86/kvm/ioapic.h | 4 +- arch/x86/kvm/x86.c | 13 +- debian.master/config/config.common.ubuntu | 1 + debian.master/upstream-stable | 4 +- drivers/net/can/spi/hi311x.c | 2 +- drivers/net/can/usb/ems_usb.c | 14 +- drivers/net/can/usb/esd_usb2.c | 16 ++- drivers/net/can/usb/mcba_usb.c | 2 + drivers/net/can/usb/usb_8dev.c | 15 ++- drivers/net/ethernet/dec/tulip/winbond-840.c | 7 +- drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 2 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 2 + drivers/net/ethernet/mellanox/mlx4/main.c | 1 + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 10 +- drivers/net/ethernet/sis/sis900.c | 7 +- drivers/net/ethernet/sun/niu.c | 3 +- drivers/net/virtio_net.c | 10 +- drivers/nfc/nfcsim.c | 3 +- fs/hfs/bfind.c | 14 +- fs/hfs/bnode.c | 25 +++- fs/hfs/btree.h | 7 + fs/hfs/super.c | 10 +- fs/ocfs2/file.c | 103 +++++++++------ include/linux/skbuff.h | 9 ++ include/linux/virtio_net.h | 14 +- include/net/af_unix.h | 1 + include/net/busy_poll.h | 2 +- include/net/llc_pdu.h | 31 +++-- include/net/sctp/constants.h | 4 +- net/802/garp.c | 14 ++ net/802/mrp.c | 14 ++ net/Makefile | 2 +- net/can/raw.c | 20 ++- net/core/dev.c | 3 +- net/core/sock.c | 2 +- net/llc/af_llc.c | 10 +- net/llc/llc_s_ac.c | 2 +- net/netfilter/nf_conntrack_core.c | 7 +- net/netfilter/nft_nat.c | 4 +- net/sctp/input.c | 2 +- net/sctp/protocol.c | 3 +- net/tipc/socket.c | 9 +- net/unix/Kconfig | 5 + net/unix/Makefile | 2 + net/unix/af_unix.c | 102 +++++++-------- net/unix/garbage.c | 68 +--------- net/unix/scm.c | 149 ++++++++++++++++++++++ net/unix/scm.h | 10 ++ net/wireless/scan.c | 6 +- tools/testing/selftests/vm/userfaultfd.c | 2 +- 54 files changed, 531 insertions(+), 252 deletions(-) create mode 100644 net/unix/scm.c create mode 100644 net/unix/scm.h