--- /dev/null
+From b0cab80ecd54ae3b2356bb081af0bffd538c8265 Mon Sep 17 00:00:00 2001
+From: Liam Howlett <liam.howlett@oracle.com>
+Date: Mon, 27 Jun 2022 15:18:59 +0000
+Subject: android: binder: fix lockdep check on clearing vma
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Liam Howlett <liam.howlett@oracle.com>
+
+commit b0cab80ecd54ae3b2356bb081af0bffd538c8265 upstream.
+
+When munmapping a vma, the mmap_lock can be degraded to a write before
+calling close() on the file handle. The binder close() function calls
+binder_alloc_set_vma() to clear the vma address, which now has a lock dep
+check for writing on the mmap_lock. Change the lockdep check to ensure
+the reading lock is held while clearing and keep the write check while
+writing.
+
+Link: https://lkml.kernel.org/r/20220627151857.2316964-1-Liam.Howlett@oracle.com
+Fixes: 472a68df605b ("android: binder: stop saving a pointer to the VMA")
+Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
+Reported-by: syzbot+da54fa8d793ca89c741f@syzkaller.appspotmail.com
+Acked-by: Todd Kjos <tkjos@google.com>
+Cc: "Arve Hjønnevåg" <arve@android.com>
+Cc: Christian Brauner (Microsoft) <brauner@kernel.org>
+Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Cc: Hridya Valsaraju <hridya@google.com>
+Cc: Joel Fernandes <joel@joelfernandes.org>
+Cc: Martijn Coenen <maco@android.com>
+Cc: Suren Baghdasaryan <surenb@google.com>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/android/binder_alloc.c | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+--- a/drivers/android/binder_alloc.c
++++ b/drivers/android/binder_alloc.c
+@@ -315,12 +315,19 @@ static inline void binder_alloc_set_vma(
+ {
+ unsigned long vm_start = 0;
+
++ /*
++ * Allow clearing the vma with holding just the read lock to allow
++ * munmapping downgrade of the write lock before freeing and closing the
++ * file using binder_alloc_vma_close().
++ */
+ if (vma) {
+ vm_start = vma->vm_start;
+ alloc->vma_vm_mm = vma->vm_mm;
++ mmap_assert_write_locked(alloc->vma_vm_mm);
++ } else {
++ mmap_assert_locked(alloc->vma_vm_mm);
+ }
+
+- mmap_assert_write_locked(alloc->vma_vm_mm);
+ alloc->vma_addr = vm_start;
+ }
+
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
- fs/btrfs/tree-checker.c | 25 +++++++++++++++++++++++--
+ fs/btrfs/tree-checker.c | 25 +++++++++++++++++++++++--
1 file changed, 23 insertions(+), 2 deletions(-)
-diff --git a/fs/btrfs/tree-checker.c b/fs/btrfs/tree-checker.c
-index 9e0e0ae2288cd..43f905ab0a18d 100644
--- a/fs/btrfs/tree-checker.c
+++ b/fs/btrfs/tree-checker.c
-@@ -1233,7 +1233,8 @@ static void extent_err(const struct extent_buffer *eb, int slot,
+@@ -1233,7 +1233,8 @@ static void extent_err(const struct exte
}
static int check_extent_item(struct extent_buffer *leaf,
{
struct btrfs_fs_info *fs_info = leaf->fs_info;
struct btrfs_extent_item *ei;
-@@ -1453,6 +1454,26 @@ static int check_extent_item(struct extent_buffer *leaf,
+@@ -1453,6 +1454,26 @@ static int check_extent_item(struct exte
total_refs, inline_refs);
return -EUCLEAN;
}
return 0;
}
-@@ -1621,7 +1642,7 @@ static int check_leaf_item(struct extent_buffer *leaf,
+@@ -1621,7 +1642,7 @@ static int check_leaf_item(struct extent
break;
case BTRFS_EXTENT_ITEM_KEY:
case BTRFS_METADATA_ITEM_KEY:
break;
case BTRFS_TREE_BLOCK_REF_KEY:
case BTRFS_SHARED_DATA_REF_KEY:
---
-2.35.1
-
--- /dev/null
+From dc633700f00f726e027846a318c5ffeb8deaaeda Mon Sep 17 00:00:00 2001
+From: Zhengchao Shao <shaozhengchao@huawei.com>
+Date: Wed, 27 Jul 2022 17:33:12 +0800
+Subject: net/af_packet: check len when min_header_len equals to 0
+
+From: Zhengchao Shao <shaozhengchao@huawei.com>
+
+commit dc633700f00f726e027846a318c5ffeb8deaaeda upstream.
+
+User can use AF_PACKET socket to send packets with the length of 0.
+When min_header_len equals to 0, packet_snd will call __dev_queue_xmit
+to send packets, and sock->type can be any type.
+
+Reported-by: syzbot+5ea725c25d06fb9114c4@syzkaller.appspotmail.com
+Fixes: fd1894224407 ("bpf: Don't redirect packets with invalid pkt_len")
+Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ net/packet/af_packet.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/net/packet/af_packet.c
++++ b/net/packet/af_packet.c
+@@ -3037,8 +3037,8 @@ static int packet_snd(struct socket *soc
+ if (err)
+ goto out_free;
+
+- if (sock->type == SOCK_RAW &&
+- !dev_validate_header(dev, skb->data, len)) {
++ if ((sock->type == SOCK_RAW &&
++ !dev_validate_header(dev, skb->data, len)) || !skb->len) {
+ err = -EINVAL;
+ goto out_free;
+ }
btrfs-move-lockdep-class-helpers-to-locking.c.patch
btrfs-fix-lockdep-splat-with-reloc-root-extent-buffe.patch
btrfs-tree-checker-check-for-overlapping-extent-item.patch
+android-binder-fix-lockdep-check-on-clearing-vma.patch
+net-af_packet-check-len-when-min_header_len-equals-to-0.patch
projects / thirdparty / kernel / stable-queue.git / commitdiff
