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, Junxiao Bi <junxiao.bi@oracle.com>,
	Jie Liu <jeff.liu@oracle.com>, Joel Becker <jlbec@evilplan.org>,
	Mark Fasheh <mfasheh@suse.com>,
	Sunil Mushran <sunil.mushran@gmail.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	Linus Torvalds <torvalds@linux-foundation.org>
Subject: [ 39/72] ocfs2: xattr: fix inlined xattr reflink
Date: Thu, 18 Jul 2013 22:25:56 -0700	[thread overview]
Message-ID: <20130719052602.533746324@linuxfoundation.org> (raw)
In-Reply-To: <20130719052559.852627424@linuxfoundation.org>

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

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

From: Junxiao Bi <junxiao.bi@oracle.com>

commit ef962df057aaafd714f5c22ba3de1be459571fdf upstream.

Inlined xattr shared free space of inode block with inlined data or data
extent record, so the size of the later two should be adjusted when
inlined xattr is enabled.  See ocfs2_xattr_ibody_init().  But this isn't
done well when reflink.  For inode with inlined data, its max inlined
data size is adjusted in ocfs2_duplicate_inline_data(), no problem.  But
for inode with data extent record, its record count isn't adjusted.  Fix
it, or data extent record and inlined xattr may overwrite each other,
then cause data corruption or xattr failure.

One panic caused by this bug in our test environment is the following:

  kernel BUG at fs/ocfs2/xattr.c:1435!
  invalid opcode: 0000 [#1] SMP
  Pid: 10871, comm: multi_reflink_t Not tainted 2.6.39-300.17.1.el5uek #1
  RIP: ocfs2_xa_offset_pointer+0x17/0x20 [ocfs2]
  RSP: e02b:ffff88007a587948  EFLAGS: 00010283
  RAX: 0000000000000000 RBX: 0000000000000010 RCX: 00000000000051e4
  RDX: ffff880057092060 RSI: 0000000000000f80 RDI: ffff88007a587a68
  RBP: ffff88007a587948 R08: 00000000000062f4 R09: 0000000000000000
  R10: 0000000000000000 R11: 0000000000000000 R12: 0000000000000010
  R13: ffff88007a587a68 R14: 0000000000000001 R15: ffff88007a587c68
  FS:  00007fccff7f06e0(0000) GS:ffff88007fc00000(0000) knlGS:0000000000000000
  CS:  e033 DS: 0000 ES: 0000 CR0: 000000008005003b
  CR2: 00000000015cf000 CR3: 000000007aa76000 CR4: 0000000000000660
  DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
  DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
  Process multi_reflink_t
  Call Trace:
    ocfs2_xa_reuse_entry+0x60/0x280 [ocfs2]
    ocfs2_xa_prepare_entry+0x17e/0x2a0 [ocfs2]
    ocfs2_xa_set+0xcc/0x250 [ocfs2]
    ocfs2_xattr_ibody_set+0x98/0x230 [ocfs2]
    __ocfs2_xattr_set_handle+0x4f/0x700 [ocfs2]
    ocfs2_xattr_set+0x6c6/0x890 [ocfs2]
    ocfs2_xattr_user_set+0x46/0x50 [ocfs2]
    generic_setxattr+0x70/0x90
    __vfs_setxattr_noperm+0x80/0x1a0
    vfs_setxattr+0xa9/0xb0
    setxattr+0xc3/0x120
    sys_fsetxattr+0xa8/0xd0
    system_call_fastpath+0x16/0x1b

Signed-off-by: Junxiao Bi <junxiao.bi@oracle.com>
Reviewed-by: Jie Liu <jeff.liu@oracle.com>
Acked-by: Joel Becker <jlbec@evilplan.org>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Sunil Mushran <sunil.mushran@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 fs/ocfs2/xattr.c |   10 ++++++++++
 1 file changed, 10 insertions(+)

--- a/fs/ocfs2/xattr.c
+++ b/fs/ocfs2/xattr.c
@@ -6499,6 +6499,16 @@ static int ocfs2_reflink_xattr_inline(st
 	}
 
 	new_oi = OCFS2_I(args->new_inode);
+	/*
+	 * Adjust extent record count to reserve space for extended attribute.
+	 * Inline data count had been adjusted in ocfs2_duplicate_inline_data().
+	 */
+	if (!(new_oi->ip_dyn_features & OCFS2_INLINE_DATA_FL) &&
+	    !(ocfs2_inode_is_fast_symlink(args->new_inode))) {
+		struct ocfs2_extent_list *el = &new_di->id2.i_list;
+		le16_add_cpu(&el->l_count, -(inline_size /
+					sizeof(struct ocfs2_extent_rec)));
+	}
 	spin_lock(&new_oi->ip_lock);
 	new_oi->ip_dyn_features |= OCFS2_HAS_XATTR_FL | OCFS2_INLINE_XATTR_FL;
 	new_di->i_dyn_features = cpu_to_le16(new_oi->ip_dyn_features);



  parent reply	other threads:[~2013-07-19  5:25 UTC|newest]

Thread overview: 87+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-19  5:25 [ 00/72] 3.10.2-stable review Greg Kroah-Hartman
2013-07-19  5:25 ` [ 01/72] CIFS use sensible file nlink values if unprovided Greg Kroah-Hartman
2013-07-19  5:25 ` [ 02/72] CIFS: Fix a deadlock when a file is reopened Greg Kroah-Hartman
2013-07-19  5:25 ` [ 03/72] rtlwifi: rtl8192cu: Add new USB ID for TP-Link TL-WN8200ND Greg Kroah-Hartman
2013-07-19  5:25 ` [ 04/72] rtlwifi: rtl8723ae: Fix typo in firmware names Greg Kroah-Hartman
2013-07-19  5:25 ` [ 05/72] rtlwifi: rtl8192cu: Fix duplicate if test Greg Kroah-Hartman
2013-07-19  5:25 ` [ 06/72] jbd2: move superblock checksum calculation to jbd2_write_superblock() Greg Kroah-Hartman
2013-07-19  5:25 ` [ 07/72] jbd2: fix theoretical race in jbd2__journal_restart Greg Kroah-Hartman
2013-07-19  5:25 ` [ 08/72] ext4: fix corruption when online resizing a fs with 1K block size Greg Kroah-Hartman
2013-07-19  5:25 ` [ 09/72] ext3,ext4: dont mess with dir_file->f_pos in htree_dirblock_to_tree() Greg Kroah-Hartman
2013-07-19  5:25 ` [ 10/72] ext4: check error return from ext4_write_inline_data_end() Greg Kroah-Hartman
2013-07-19  5:25 ` [ 11/72] pch_uart: Add uart_clk selection for the MinnowBoard Greg Kroah-Hartman
2013-07-19  5:25 ` [ 12/72] USB: option,qcserial: move Novatel Gobi1K IDs to qcserial Greg Kroah-Hartman
2013-07-19  5:25 ` [ 13/72] usb: gadget: f_mass_storage: add missing memory barrier for thread_wakeup_needed Greg Kroah-Hartman
2013-07-19  5:25 ` [ 14/72] USB: ehci-omap: Tweak PHY initialization sequence Greg Kroah-Hartman
2013-07-19  5:25 ` [ 15/72] xhci: check for failed dma pool allocation Greg Kroah-Hartman
2013-07-19  5:25 ` [ 16/72] usb: host: xhci-plat: release mem region while removing module Greg Kroah-Hartman
2013-07-19  5:25 ` [ 17/72] drivers: hv: switch to use mb() instead of smp_mb() Greg Kroah-Hartman
2013-07-19  5:25 ` [ 18/72] pcmcia: at91_cf: fix gpio_get_value in at91_cf_get_status Greg Kroah-Hartman
2013-07-19  5:25 ` [ 19/72] cgroup: fix umount vs cgroup_event_remove() race Greg Kroah-Hartman
2013-07-19  5:25 ` [ 20/72] cgroup: fix RCU accesses to task->cgroups Greg Kroah-Hartman
2013-07-19  5:25 ` [ 21/72] parisc: document the shadow registers Greg Kroah-Hartman
2013-07-19  5:25 ` [ 22/72] parisc: Fix gcc miscompilation in pa_memcpy() Greg Kroah-Hartman
2013-07-19  5:25 ` [ 23/72] slab: fix init_lock_keys Greg Kroah-Hartman
2013-07-19  5:25 ` [ 24/72] parisc: Ensure volatile space register %sr1 is not clobbered Greg Kroah-Hartman
2013-07-19  5:25 ` [ 25/72] parisc: fix LMMIO mismatch between PAT length and MASK register Greg Kroah-Hartman
2013-07-19  5:25 ` [ 26/72] parisc: optimize mtsp(0,sr) inline assembly Greg Kroah-Hartman
2013-07-19  5:25 ` [ 27/72] x86, efi: retry ExitBootServices() on failure Greg Kroah-Hartman
2013-07-19  5:25 ` [ 28/72] xen/time: remove blocked time accounting from xen "clockchip" Greg Kroah-Hartman
2013-07-19  5:25 ` [ 29/72] xen/pcifront: Deal with toolstack missing XenbusStateClosing state Greg Kroah-Hartman
2013-07-19  5:25 ` [ 30/72] genirq: Fix can_request_irq() for IRQs without an action Greg Kroah-Hartman
2013-07-19  5:25 ` [ 31/72] drivers/rtc/rtc-rv3029c2.c: fix disabling AIE irq Greg Kroah-Hartman
2013-07-19  5:25 ` [ 32/72] ACPI: Add CMOS RTC Operation Region handler support Greg Kroah-Hartman
2013-07-19  5:25 ` [ 33/72] ACPI / EC: Add HP Folio 13 to ec_dmi_table in order to skip DSDT scan Greg Kroah-Hartman
2013-07-19  5:25 ` [ 34/72] ACPICA: Do not use extended sleep registers unless HW-reduced bit is set Greg Kroah-Hartman
2013-07-19  5:25 ` [ 35/72] ACPI / PM: Fix corner case in acpi_bus_update_power() Greg Kroah-Hartman
2013-07-19  5:25 ` [ 36/72] HID: apple: Add support for the 2013 Macbook Air Greg Kroah-Hartman
2013-07-19  5:25 ` [ 37/72] Input: bcm5974 - add support for the 2013 MacBook Air Greg Kroah-Hartman
2013-07-19  5:40   ` Dmitry Torokhov
2013-07-19  5:44     ` Greg Kroah-Hartman
2013-07-22  1:42       ` Greg Kroah-Hartman
2013-07-22  2:21         ` Dmitry Torokhov
2013-07-22 10:07           ` rydberg
2013-07-19  5:25 ` [ 38/72] arch: c6x: mm: include "asm/uaccess.h" to pass compiling Greg Kroah-Hartman
2013-07-19  5:25 ` Greg Kroah-Hartman [this message]
2013-07-19  5:25 ` [ 40/72] nbd: correct disconnect behavior Greg Kroah-Hartman
2013-07-19  5:25 ` [ 41/72] PCI: Finish SR-IOV VF setup before adding the device Greg Kroah-Hartman
2013-07-19  5:25 ` [ 42/72] PCI: Fix refcount issue in pci_create_root_bus() error recovery path Greg Kroah-Hartman
2013-07-19  5:26 ` [ 43/72] iwlwifi: pcie: fix race in queue unmapping Greg Kroah-Hartman
2013-07-19  5:26 ` [ 44/72] iwlwifi: pcie: wake the queue if stopped when being unmapped Greg Kroah-Hartman
2013-07-19  5:26 ` [ 45/72] ahci: Add AMD CZ SATA device ID Greg Kroah-Hartman
2013-07-19  5:26 ` [ 46/72] ahci: AHCI-mode SATA patch for Intel Coleto Creek DeviceIDs Greg Kroah-Hartman
2013-07-19  5:26 ` [ 47/72] ahci: remove pmp link online check in FBS EH Greg Kroah-Hartman
2013-07-19  5:26 ` [ 48/72] timer: Fix jiffies wrap behavior of round_jiffies_common() Greg Kroah-Hartman
2013-07-19  5:26 ` [ 49/72] Btrfs: fix estale with btrfs send Greg Kroah-Hartman
2013-07-19  5:26 ` [ 50/72] Btrfs: hold the tree mod lock in __tree_mod_log_rewind Greg Kroah-Hartman
2013-07-19  5:26 ` [ 51/72] Btrfs: only do the tree_mod_log_free_eb if this is our last ref Greg Kroah-Hartman
2013-07-19  5:26 ` [ 52/72] ext4: fix data offset overflow on 32-bit archs in ext4_inline_data_fiemap() Greg Kroah-Hartman
2013-07-19  5:26 ` [ 53/72] ext4: fix overflows in SEEK_HOLE, SEEK_DATA implementations Greg Kroah-Hartman
2013-07-19  5:26 ` [ 54/72] ext4: fix data offset overflow in ext4_xattr_fiemap() on 32-bit archs Greg Kroah-Hartman
2013-07-19  5:26 ` [ 55/72] ext4: fix overflow when counting used blocks on 32-bit architectures Greg Kroah-Hartman
2013-07-19  5:26 ` [ 56/72] ext4: fix ext4_get_group_number() Greg Kroah-Hartman
2013-07-19  5:26 ` [ 57/72] ext4: dont show usrquota/grpquota twice in /proc/mounts Greg Kroah-Hartman
2013-07-19  5:26 ` [ 58/72] ext4: dont allow ext4_free_blocks() to fail due to ENOMEM Greg Kroah-Hartman
2013-07-19  5:26 ` [ 59/72] ARM: 7765/1: perf: Record the user-mode PC in the call chain Greg Kroah-Hartman
2013-07-19  5:26 ` [ 60/72] ARM: 7767/1: let the ASID allocator handle suspended animation Greg Kroah-Hartman
2013-07-19  5:26 ` [ 61/72] ARM: 7768/1: prevent risks of out-of-bound access in ASID allocator Greg Kroah-Hartman
2013-07-19  5:26 ` [ 62/72] ARM: 7769/1: Cortex-A15: fix erratum 798181 implementation Greg Kroah-Hartman
2013-07-19  5:26 ` [ 63/72] ARM: 7778/1: smp_twd: twd_update_frequency need be run on all online CPUs Greg Kroah-Hartman
2013-07-19  5:26 ` [ 64/72] ARM: dts: imx: cpus/cpu nodes dts updates Greg Kroah-Hartman
2013-07-19  5:26 ` [ 65/72] ARM: shmobile: r8a73a4: Fix resources for SCIFB0 Greg Kroah-Hartman
2013-07-19  5:26 ` [ 66/72] ARM: shmobile: emev2 GIO3 resource fix Greg Kroah-Hartman
2013-07-19  5:26 ` [ 67/72] ARM: mm: fix boot on SA1110 Assabet Greg Kroah-Hartman
2013-07-19  5:26 ` [ 68/72] drivers/dma/pl330.c: fix locking in pl330_free_chan_resources() Greg Kroah-Hartman
2013-07-19  5:26 ` [ 69/72] memcg, kmem: fix reference count handling on the error path Greg Kroah-Hartman
2013-07-19  5:26 ` [ 70/72] mm/memory-hotplug: fix lowmem count overflow when offline pages Greg Kroah-Hartman
2013-07-19  5:26 ` [ 71/72] Handle big endianness in NTLM (ntlmv2) authentication Greg Kroah-Hartman
2013-07-19  5:26 ` [ 72/72] UBIFS: correct mount message Greg Kroah-Hartman
2013-07-19  7:27 ` [ 00/72] 3.10.2-stable review Sven Joachim
2013-07-19 15:40   ` Greg Kroah-Hartman
2013-07-21  2:23     ` Satoru Takeuchi
2013-07-19 23:16 ` Shuah Khan
2013-07-19 23:44   ` Greg Kroah-Hartman
2013-07-20  0:17 ` Stefan Lippers-Hollmann
2013-07-20  0:25   ` [please disregard] " Stefan Lippers-Hollmann
2013-07-21  7:56 ` Willy Tarreau
2013-07-21 15:50   ` 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=20130719052602.533746324@linuxfoundation.org \
    --to=gregkh@linuxfoundation.org \
    --cc=akpm@linux-foundation.org \
    --cc=jeff.liu@oracle.com \
    --cc=jlbec@evilplan.org \
    --cc=junxiao.bi@oracle.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mfasheh@suse.com \
    --cc=stable@vger.kernel.org \
    --cc=sunil.mushran@gmail.com \
    --cc=torvalds@linux-foundation.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).