stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	stable@vger.kernel.org, Eric Sandeen <sandeen@redhat.com>,
	Brian Foster <bfoster@redhat.com>,
	Dave Chinner <david@fromorbit.com>
Subject: [PATCH 4.9 80/83] xfs: fix up xfs_swap_extent_forks inline extent handling
Date: Wed,  4 Jan 2017 21:07:12 +0100	[thread overview]
Message-ID: <20170104200449.770925654@linuxfoundation.org> (raw)
In-Reply-To: <20170104200446.541604386@linuxfoundation.org>

4.9-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Eric Sandeen <sandeen@sandeen.net>

commit 4dfce57db6354603641132fac3c887614e3ebe81 upstream.

There have been several reports over the years of NULL pointer
dereferences in xfs_trans_log_inode during xfs_fsr processes,
when the process is doing an fput and tearing down extents
on the temporary inode, something like:

BUG: unable to handle kernel NULL pointer dereference at 0000000000000018
PID: 29439  TASK: ffff880550584fa0  CPU: 6   COMMAND: "xfs_fsr"
    [exception RIP: xfs_trans_log_inode+0x10]
 #9 [ffff8800a57bbbe0] xfs_bunmapi at ffffffffa037398e [xfs]
#10 [ffff8800a57bbce8] xfs_itruncate_extents at ffffffffa0391b29 [xfs]
#11 [ffff8800a57bbd88] xfs_inactive_truncate at ffffffffa0391d0c [xfs]
#12 [ffff8800a57bbdb8] xfs_inactive at ffffffffa0392508 [xfs]
#13 [ffff8800a57bbdd8] xfs_fs_evict_inode at ffffffffa035907e [xfs]
#14 [ffff8800a57bbe00] evict at ffffffff811e1b67
#15 [ffff8800a57bbe28] iput at ffffffff811e23a5
#16 [ffff8800a57bbe58] dentry_kill at ffffffff811dcfc8
#17 [ffff8800a57bbe88] dput at ffffffff811dd06c
#18 [ffff8800a57bbea8] __fput at ffffffff811c823b
#19 [ffff8800a57bbef0] ____fput at ffffffff811c846e
#20 [ffff8800a57bbf00] task_work_run at ffffffff81093b27
#21 [ffff8800a57bbf30] do_notify_resume at ffffffff81013b0c
#22 [ffff8800a57bbf50] int_signal at ffffffff8161405d

As it turns out, this is because the i_itemp pointer, along
with the d_ops pointer, has been overwritten with zeros
when we tear down the extents during truncate.  When the in-core
inode fork on the temporary inode used by xfs_fsr was originally
set up during the extent swap, we mistakenly looked at di_nextents
to determine whether all extents fit inline, but this misses extents
generated by speculative preallocation; we should be using if_bytes
instead.

This mistake corrupts the in-memory inode, and code in
xfs_iext_remove_inline eventually gets bad inputs, causing
it to memmove and memset incorrect ranges; this became apparent
because the two values in ifp->if_u2.if_inline_ext[1] contained
what should have been in d_ops and i_itemp; they were memmoved due
to incorrect array indexing and then the original locations
were zeroed with memset, again due to an array overrun.

Fix this by properly using i_df.if_bytes to determine the number
of extents, not di_nextents.

Thanks to dchinner for looking at this with me and spotting the
root cause.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 fs/xfs/xfs_bmap_util.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

--- a/fs/xfs/xfs_bmap_util.c
+++ b/fs/xfs/xfs_bmap_util.c
@@ -1792,6 +1792,7 @@ xfs_swap_extent_forks(
 	struct xfs_ifork	tempifp, *ifp, *tifp;
 	int			aforkblks = 0;
 	int			taforkblks = 0;
+	xfs_extnum_t		nextents;
 	__uint64_t		tmp;
 	int			error;
 
@@ -1881,7 +1882,8 @@ xfs_swap_extent_forks(
 		 * pointer.  Otherwise it's already NULL or
 		 * pointing to the extent.
 		 */
-		if (ip->i_d.di_nextents <= XFS_INLINE_EXTS) {
+		nextents = ip->i_df.if_bytes / (uint)sizeof(xfs_bmbt_rec_t);
+		if (nextents <= XFS_INLINE_EXTS) {
 			ifp->if_u1.if_extents =
 				ifp->if_u2.if_inline_ext;
 		}
@@ -1900,7 +1902,8 @@ xfs_swap_extent_forks(
 		 * pointer.  Otherwise it's already NULL or
 		 * pointing to the extent.
 		 */
-		if (tip->i_d.di_nextents <= XFS_INLINE_EXTS) {
+		nextents = tip->i_df.if_bytes / (uint)sizeof(xfs_bmbt_rec_t);
+		if (nextents <= XFS_INLINE_EXTS) {
 			tifp->if_u1.if_extents =
 				tifp->if_u2.if_inline_ext;
 		}



  parent reply	other threads:[~2017-01-04 20:14 UTC|newest]

Thread overview: 86+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <CGME20170104200710epcas5p1339068db1097bb4b4df5379cb539f508@epcas5p1.samsung.com>
2017-01-04 20:05 ` [PATCH 4.9 00/83] 4.9.1-stable review Greg Kroah-Hartman
2017-01-04 20:05   ` [PATCH 4.9 01/83] hotplug: Make register and unregister notifier API symmetric Greg Kroah-Hartman
2017-01-04 20:05   ` [PATCH 4.9 02/83] btrfs: limit async_work allocation and worker func duration Greg Kroah-Hartman
2017-01-04 20:05   ` [PATCH 4.9 03/83] Btrfs: fix BUG_ON in btrfs_mark_buffer_dirty Greg Kroah-Hartman
2017-01-04 20:05   ` [PATCH 4.9 04/83] Btrfs: fix deadlock caused by fsync when logging directory entries Greg Kroah-Hartman
2017-01-04 20:05   ` [PATCH 4.9 05/83] Btrfs: fix tree search logic when replaying directory entry deletes Greg Kroah-Hartman
2017-01-04 20:05   ` [PATCH 4.9 06/83] Btrfs: fix relocation incorrectly dropping data references Greg Kroah-Hartman
2017-01-04 20:05   ` [PATCH 4.9 07/83] btrfs: store and load values of stripes_min/stripes_max in balance status item Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 08/83] Btrfs: fix emptiness check for dirtied extent buffers at check_leaf() Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 09/83] Btrfs: fix qgroup rescan worker initialization Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 10/83] USB: serial: option: add support for Telit LE922A PIDs 0x1040, 0x1041 Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 11/83] USB: serial: option: add dlink dwm-158 Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 12/83] USB: serial: kl5kusb105: fix open error path Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 13/83] USB: cdc-acm: add device id for GW Instek AFG-125 Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 14/83] usb: dwc3: gadget: set PCM1 field of isochronous-first TRBs Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 15/83] usb: hub: Fix auto-remount of safely removed or ejected USB-3 devices Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 17/83] usb: gadget: f_uac2: fix error handling at afunc_bind Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 18/83] usb: gadget: composite: correctly initialize ep->maxpacket Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 19/83] USB: UHCI: report non-PME wakeup signalling for Intel hardware Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 20/83] usbip: vudc: fix: Clear already_seen flag also for ep0 Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 21/83] ALSA: usb-audio: Add QuickCam Communicate Deluxe/S7500 to volume_control_quirks Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 22/83] ALSA: hiface: Fix M2Tech hiFace driver sampling rate change Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 23/83] ALSA: hda/ca0132 - Add quirk for Alienware 15 R2 2016 Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 24/83] ALSA: hda - ignore the assoc and seq when comparing pin configurations Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 25/83] ALSA: hda - fix headset-mic problem on a Dell laptop Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 26/83] ALSA: hda - Gate the mic jack on HP Z1 Gen3 AiO Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 27/83] ALSA: hda: when comparing pin configurations, ignore assoc in addition to seq Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 28/83] clk: ti: omap36xx: Work around sprz319 advisory 2.1 Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 29/83] exec: Ensure mm->user_ns contains the execed files Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 30/83] fs: exec: apply CLOEXEC before changing dumpable task flags Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 31/83] splice: reinstate SIGPIPE/EPIPE handling Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 32/83] block_dev: dont test bdev->bd_contains when it is not stable Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 33/83] mm: Add a user_ns owner to mm_struct and fix ptrace permission checks Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 34/83] vfs,mm: fix return value of read() at s_maxbytes Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 35/83] ptrace: Capture the ptracers creds not PT_PTRACE_CAP Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 36/83] ptrace: Dont allow accessing an undumpable mm Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 38/83] ext4: dont lock buffer in ext4_commit_super if holding spinlock Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 39/83] ext4: fix mballoc breakage with 64k block size Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 40/83] ext4: fix stack memory corruption " Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 41/83] ext4: use more strict checks for inodes_per_block on mount Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 42/83] ext4: fix in-superblock mount options processing Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 43/83] ext4: add sanity checking to count_overhead() Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 44/83] ext4: reject inodes with negative size Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 45/83] ext4: return -ENOMEM instead of success Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 46/83] ext4: do not perform data journaling when data is encrypted Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 47/83] Revert "f2fs: use percpu_counter for # of dirty pages in inode" Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 48/83] f2fs: set ->owner for debugfs status files file_operations Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 49/83] f2fs: fix overflow due to condition check order Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 50/83] f2fs: fix to determine start_cp_addr by sbi->cur_cp_pack Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 51/83] loop: return proper error from loop_queue_rq() Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 52/83] nvmet: Fix possible infinite loop triggered on hot namespace removal Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 53/83] mm/vmscan.c: set correct defer count for shrinker Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 54/83] mm, page_alloc: keep pcp count and list contents in sync if struct page is corrupted Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 55/83] usb: gadget: composite: always set ep->mult to a sensible value Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 56/83] PM / OPP: Pass opp_table to dev_pm_opp_put_regulator() Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 57/83] PM / OPP: Dont use OPP structure outside of rcu protected section Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 58/83] blk-mq: Do not invoke .queue_rq() for a stopped queue Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 59/83] dm table: fix all_blk_mq inconsistency when an empty table is loaded Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 60/83] dm table: an all_blk_mq table must be loaded for a blk-mq DM device Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 61/83] dm flakey: return -EINVAL on interval bounds error in flakey_ctr() Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 62/83] dm crypt: mark key as invalid until properly loaded Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 63/83] dm rq: fix a race condition in rq_completed() Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 64/83] dm raid: fix discard support regression Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 65/83] dm space map metadata: fix struct sm_metadata leak on failed create Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 66/83] ASoC: intel: Fix crash at suspend/resume without card registration Greg Kroah-Hartman
2017-01-04 20:06   ` [PATCH 4.9 67/83] cifs: Fix smbencrypt() to stop pointing a scatterlist at the stack Greg Kroah-Hartman
2017-01-04 20:07   ` [PATCH 4.9 68/83] CIFS: Fix a possible memory corruption during reconnect Greg Kroah-Hartman
2017-01-04 20:07   ` [PATCH 4.9 69/83] CIFS: Fix missing nls unload in smb2_reconnect() Greg Kroah-Hartman
2017-01-04 20:07   ` [PATCH 4.9 70/83] CIFS: Fix a possible double locking of mutex during reconnect Greg Kroah-Hartman
2017-01-04 20:07   ` [PATCH 4.9 71/83] CIFS: Decrease verbosity of ioctl call Greg Kroah-Hartman
2017-01-04 20:07   ` [PATCH 4.9 72/83] CIFS: Fix a possible memory corruption in push locks Greg Kroah-Hartman
2017-01-04 20:07   ` [PATCH 4.9 73/83] kernel/watchdog: use nmi registers snapshot in hardlockup handler Greg Kroah-Hartman
2017-01-04 20:07   ` [PATCH 4.9 74/83] watchdog: mei_wdt: request stop on reboot to prevent false positive event Greg Kroah-Hartman
2017-01-04 20:07   ` [PATCH 4.9 75/83] watchdog: qcom: fix kernel panic due to external abort on non-linefetch Greg Kroah-Hartman
2017-01-04 20:07   ` [PATCH 4.9 76/83] kernel/debug/debug_core.c: more properly delay for secondary CPUs Greg Kroah-Hartman
2017-01-04 20:07   ` [PATCH 4.9 77/83] tpm xen: Remove bogus tpm_chip_unregister Greg Kroah-Hartman
2017-01-04 20:07   ` [PATCH 4.9 78/83] xen/gntdev: Use VM_MIXEDMAP instead of VM_IO to avoid NUMA balancing Greg Kroah-Hartman
2017-01-04 20:07   ` [PATCH 4.9 79/83] arm/xen: Use alloc_percpu rather than __alloc_percpu Greg Kroah-Hartman
2017-01-04 20:07   ` Greg Kroah-Hartman [this message]
2017-01-04 20:07   ` [PATCH 4.9 81/83] xfs: set AGI buffer type in xlog_recover_clear_agi_bucket Greg Kroah-Hartman
2017-01-04 20:07   ` [PATCH 4.9 82/83] builddeb: fix cross-building to arm64 producing host-arch debs Greg Kroah-Hartman
2017-01-04 20:07   ` [PATCH 4.9 83/83] x86/kbuild: enable modversions for symbols exported from asm Greg Kroah-Hartman
2017-01-05  0:41   ` [PATCH 4.9 00/83] 4.9.1-stable review Shuah Khan
2017-01-05  7:52     ` Greg Kroah-Hartman
2017-01-05  4:50   ` Guenter Roeck
2017-01-05  7:53     ` Greg Kroah-Hartman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170104200449.770925654@linuxfoundation.org \
    --to=gregkh@linuxfoundation.org \
    --cc=bfoster@redhat.com \
    --cc=david@fromorbit.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=sandeen@redhat.com \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).