diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-23 13:20:21 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-23 13:20:21 -0400 |
| commit | d5fa4f4f8993f9e1ce7d12513958bd4e7d22fc1d (patch) | |
| tree | ad272eb6f777558bebbccfacf481a97bcc76a9af | |
| parent | 2f890c946e2b6a2e2200f0b36711675b2fbf4c43 (diff) | |
| download | longterm-queue-4.12-d5fa4f4f8993f9e1ce7d12513958bd4e7d22fc1d.tar.gz | |
ext4: drop patch n/a for 4.12
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/ext4-add-missing-error-check-in-__ext4_new_inode.patch | 33 | ||||
| -rw-r--r-- | queue/series | 1 |
2 files changed, 0 insertions, 34 deletions
diff --git a/queue/ext4-add-missing-error-check-in-__ext4_new_inode.patch b/queue/ext4-add-missing-error-check-in-__ext4_new_inode.patch deleted file mode 100644 index 26f3498..0000000 --- a/queue/ext4-add-missing-error-check-in-__ext4_new_inode.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 996fc4477a0ea28226b30d175f053fb6f9a4fa36 Mon Sep 17 00:00:00 2001 -From: Theodore Ts'o <tytso@mit.edu> -Date: Sun, 10 Dec 2017 23:44:11 -0500 -Subject: [PATCH] ext4: add missing error check in __ext4_new_inode() - -commit 996fc4477a0ea28226b30d175f053fb6f9a4fa36 upstream. - -It's possible for ext4_get_acl() to return an ERR_PTR. So we need to -add a check for this case in __ext4_new_inode(). Otherwise on an -error we can end up oops the kernel. - -This was getting triggered by xfstests generic/388, which is a test -which exercises the shutdown code path. - -Signed-off-by: Theodore Ts'o <tytso@mit.edu> -Cc: stable@vger.kernel.org - -diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c -index b4267d72f249..b32cf263750d 100644 ---- a/fs/ext4/ialloc.c -+++ b/fs/ext4/ialloc.c -@@ -816,6 +816,8 @@ struct inode *__ext4_new_inode(handle_t *handle, struct inode *dir, - #ifdef CONFIG_EXT4_FS_POSIX_ACL - struct posix_acl *p = get_acl(dir, ACL_TYPE_DEFAULT); - -+ if (IS_ERR(p)) -+ return ERR_CAST(p); - if (p) { - int acl_size = p->a_count * sizeof(ext4_acl_entry); - --- -2.15.0 - diff --git a/queue/series b/queue/series index 1afa5dd..626bcf9 100644 --- a/queue/series +++ b/queue/series @@ -19,7 +19,6 @@ iw_cxgb4-only-insert-drain-cqes-if-wq-is-flushed.patch eeprom-at24-change-nvmem-stride-to-1.patch dmaengine-dmatest-move-callback-wait-queue-to-thread.patch ext4-fix-fdatasync-2-after-fallocate-2-operation.patch -ext4-add-missing-error-check-in-__ext4_new_inode.patch ext4-fix-crash-when-a-directory-s-i_size-is-too-smal.patch IB-mlx4-Fix-RSS-s-QPC-attributes-assignments.patch HID-cp2112-fix-broken-gpio_direction_input-callback.patch |