68fdd20442
-----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmPHzUQACgkQONu9yGCS aT7QohAAtxV33qGSKGUdKMZk1JzIYuc8tAa+CHZhTi6xjTsoy1a5MlQGrj8a9YQ7 /5VvwslGSn29h/ThO/ai04CfeOsWugMtnuo4mT4+198DgH0CNQMlfWq2c25cCvY6 dIrrMTA7B2YhpdbjM4vkX8QIAxBVCHOVkseSammhMnujP7d+k4LtC6rRV4uiF+lD cKtsIJn8h+pezBeo5+pjvcTwndaAoApVOES4uOjJcf9pYOOoHxyi+8StpiO+j2Pv sRvkbvvmpS+IWAH+DMa3SAFI3C3AihX2Fu0rIFzUZByAviB1NmyWluX5mU54wW3R P80fl0rQFwuygEBU1UqTXe4hQ8YYwpJGAQzbLR22a11IT2MSO+vMRINdqG1un2BE T9hHix5R0JMeIN9AP7nKGBLrEZ3V6DqxEBz6ZC1sOUIIVQv93twtiwb0rNM0e7pq PpkIXpwXPIgqFDGXrd0y5ksRT08jJUKCRttuRVWkcGX8adotngWnrl0WBI5zqSuo B+x8X9Dw7YblJ6yQ+8mAZGk0Mj3j+cb4uhuRaz/6rqHmFOrbHm+JDXvPzZY65xy3 k8Ebtq5CxINLDwahfb/o13MgbmzMPPNPPp0cz23zOhm88OmwVzB4hAoB/1CfHZvF XhSbZMVBhhP9hYr2gYl902EQeZGE5yjk5xhFT5Wrh7QoZaPW2XM= =as6n -----END PGP SIGNATURE----- Merge 5.4.229 into android11-5.4-lts Changes in 5.4.229 tracing/ring-buffer: Only do full wait when cpu != RING_BUFFER_ALL_CPUS udf: Discard preallocation before extending file with a hole udf: Fix preallocation discarding at indirect extent boundary udf: Do not bother looking for prealloc extents if i_lenExtents matches i_size udf: Fix extending file within last block usb: gadget: uvc: Prevent buffer overflow in setup handler USB: serial: option: add Quectel EM05-G modem USB: serial: cp210x: add Kamstrup RF sniffer PIDs USB: serial: f81232: fix division by zero on line-speed change USB: serial: f81534: fix division by zero on line-speed change igb: Initialize mailbox message for VF reset xen-netback: move removal of "hotplug-status" to the right place HID: ite: Add support for Acer S1002 keyboard-dock HID: ite: Enable QUIRK_TOUCHPAD_ON_OFF_REPORT on Acer Aspire Switch 10E HID: ite: Enable QUIRK_TOUCHPAD_ON_OFF_REPORT on Acer Aspire Switch V 10 HID: uclogic: Add HID_QUIRK_HIDINPUT_FORCE quirk Bluetooth: L2CAP: Fix u8 overflow net: loopback: use NET_NAME_PREDICTABLE for name_assign_type usb: musb: remove extra check in musb_gadget_vbus_draw ARM: dts: qcom: apq8064: fix coresight compatible arm64: dts: qcom: sdm845-cheza: fix AP suspend pin bias drivers: soc: ti: knav_qmss_queue: Mark knav_acc_firmwares as static arm: dts: spear600: Fix clcd interrupt soc: ti: knav_qmss_queue: Use pm_runtime_resume_and_get instead of pm_runtime_get_sync soc: ti: knav_qmss_queue: Fix PM disable depth imbalance in knav_queue_probe soc: ti: smartreflex: Fix PM disable depth imbalance in omap_sr_probe perf: arm_dsu: Fix hotplug callback leak in dsu_pmu_init() perf/smmuv3: Fix hotplug callback leak in arm_smmu_pmu_init() arm64: dts: mt2712e: Fix unit_address_vs_reg warning for oscillators arm64: dts: mt2712e: Fix unit address for pinctrl node arm64: dts: mt2712-evb: Fix vproc fixed regulators unit names arm64: dts: mt2712-evb: Fix usb vbus regulators unit names arm64: dts: mediatek: mt6797: Fix 26M oscillator unit name ARM: dts: dove: Fix assigned-addresses for every PCIe Root Port ARM: dts: armada-370: Fix assigned-addresses for every PCIe Root Port ARM: dts: armada-xp: Fix assigned-addresses for every PCIe Root Port ARM: dts: armada-375: Fix assigned-addresses for every PCIe Root Port ARM: dts: armada-38x: Fix assigned-addresses for every PCIe Root Port ARM: dts: armada-39x: Fix assigned-addresses for every PCIe Root Port ARM: dts: turris-omnia: Add ethernet aliases ARM: dts: turris-omnia: Add switch port 6 node arm64: dts: armada-3720-turris-mox: Add missing interrupt for RTC pstore/ram: Fix error return code in ramoops_probe() ARM: mmp: fix timer_read delay pstore: Avoid kcore oops by vmap()ing with VM_IOREMAP tpm/tpm_crb: Fix error message in __crb_relinquish_locality() cpuidle: dt: Return the correct numbers of parsed idle states alpha: fix syscall entry in !AUDUT_SYSCALL case PM: hibernate: Fix mistake in kerneldoc comment fs: don't audit the capability check in simple_xattr_list() selftests/ftrace: event_triggers: wait longer for test_event_enable perf: Fix possible memleak in pmu_dev_alloc() timerqueue: Use rb_entry_safe() in timerqueue_getnext() proc: fixup uptime selftest lib/fonts: fix undefined behavior in bit shift for get_default_font ocfs2: fix memory leak in ocfs2_stack_glue_init() MIPS: vpe-mt: fix possible memory leak while module exiting MIPS: vpe-cmp: fix possible memory leak while module exiting selftests/efivarfs: Add checking of the test return value PNP: fix name memory leak in pnp_alloc_dev() perf/x86/intel/uncore: Fix reference count leak in hswep_has_limit_sbox() irqchip: gic-pm: Use pm_runtime_resume_and_get() in gic_probe() EDAC/i10nm: fix refcount leak in pci_get_dev_wrapper() nfsd: don't call nfsd_file_put from client states seqfile display genirq/irqdesc: Don't try to remove non-existing sysfs files cpufreq: amd_freq_sensitivity: Add missing pci_dev_put() libfs: add DEFINE_SIMPLE_ATTRIBUTE_SIGNED for signed value lib/notifier-error-inject: fix error when writing -errno to debugfs file docs: fault-injection: fix non-working usage of negative values debugfs: fix error when writing negative value to atomic_t debugfs file ocfs2: ocfs2_mount_volume does cleanup job before return error ocfs2: rewrite error handling of ocfs2_fill_super ocfs2: fix memory leak in ocfs2_mount_volume() rapidio: fix possible name leaks when rio_add_device() fails rapidio: rio: fix possible name leak in rio_register_mport() clocksource/drivers/sh_cmt: Make sure channel clock supply is enabled ACPICA: Fix use-after-free in acpi_ut_copy_ipackage_to_ipackage() uprobes/x86: Allow to probe a NOP instruction with 0x66 prefix xen/events: only register debug interrupt for 2-level events x86/xen: Fix memory leak in xen_smp_intr_init{_pv}() x86/xen: Fix memory leak in xen_init_lock_cpu() xen/privcmd: Fix a possible warning in privcmd_ioctl_mmap_resource() PM: runtime: Improve path in rpm_idle() when no callback PM: runtime: Do not call __rpm_callback() from rpm_idle() platform/x86: mxm-wmi: fix memleak in mxm_wmi_call_mx[ds|mx]() MIPS: BCM63xx: Add check for NULL for clk in clk_enable MIPS: OCTEON: warn only once if deprecated link status is being used fs: sysv: Fix sysv_nblocks() returns wrong value rapidio: fix possible UAF when kfifo_alloc() fails eventfd: change int to __u64 in eventfd_signal() ifndef CONFIG_EVENTFD relay: fix type mismatch when allocating memory in relay_create_buf() hfs: Fix OOB Write in hfs_asc2mac rapidio: devices: fix missing put_device in mport_cdev_open wifi: ath9k: hif_usb: fix memory leak of urbs in ath9k_hif_usb_dealloc_tx_urbs() wifi: ath9k: hif_usb: Fix use-after-free in ath9k_hif_usb_reg_in_cb() wifi: rtl8xxxu: Fix reading the vendor of combo chips pata_ipx4xx_cf: Fix unsigned comparison with less than zero media: i2c: ad5820: Fix error path can: kvaser_usb: do not increase tx statistics when sending error message frames can: kvaser_usb: kvaser_usb_leaf: Get capabilities from device can: kvaser_usb: kvaser_usb_leaf: Rename {leaf,usbcan}_cmd_error_event to {leaf,usbcan}_cmd_can_error_event can: kvaser_usb: kvaser_usb_leaf: Handle CMD_ERROR_EVENT can: kvaser_usb_leaf: Set Warning state even without bus errors can: kvaser_usb_leaf: Fix improved state not being reported can: kvaser_usb_leaf: Fix wrong CAN state after stopping can: kvaser_usb_leaf: Fix bogus restart events can: kvaser_usb: Add struct kvaser_usb_busparams can: kvaser_usb: Compare requested bittiming parameters with actual parameters in do_set_{,data}_bittiming clk: renesas: r9a06g032: Repair grave increment error spi: Update reference to struct spi_controller drm/panel/panel-sitronix-st7701: Remove panel on DSI attach failure ima: Rename internal filter rule functions ima: Fix fall-through warnings for Clang ima: Handle -ESTALE returned by ima_filter_rule_match() media: vivid: fix compose size exceed boundary bpf: propagate precision in ALU/ALU64 operations mtd: Fix device name leak when register device failed in add_mtd_device() wifi: rsi: Fix handling of 802.3 EAPOL frames sent via control port media: camss: Clean up received buffers on failed start of streaming net, proc: Provide PROC_FS=n fallback for proc_create_net_single_write() rxrpc: Fix ack.bufferSize to be 0 when generating an ack drm/radeon: Add the missed acpi_put_table() to fix memory leak drm/mediatek: Modify dpi power on/off sequence. ASoC: pxa: fix null-pointer dereference in filter() regulator: core: fix unbalanced of node refcount in regulator_dev_lookup() amdgpu/pm: prevent array underflow in vega20_odn_edit_dpm_table() integrity: Fix memory leakage in keyring allocation error path ima: Fix misuse of dereference of pointer in template_desc_init_fields() wifi: ath10k: Fix return value in ath10k_pci_init() mtd: lpddr2_nvm: Fix possible null-ptr-deref Input: elants_i2c - properly handle the reset GPIO when power is off media: solo6x10: fix possible memory leak in solo_sysfs_init() media: platform: exynos4-is: Fix error handling in fimc_md_init() media: videobuf-dma-contig: use dma_mmap_coherent bpf: Move skb->len == 0 checks into __bpf_redirect HID: hid-sensor-custom: set fixed size for custom attributes ALSA: pcm: fix undefined behavior in bit shift for SNDRV_PCM_RATE_KNOT ALSA: seq: fix undefined behavior in bit shift for SNDRV_SEQ_FILTER_USE_EVENT regulator: core: use kfree_const() to free space conditionally clk: rockchip: Fix memory leak in rockchip_clk_register_pll() bonding: Export skip slave logic to function bonding: Rename slave_arr to usable_slaves bonding: fix link recovery in mode 2 when updelay is nonzero mtd: maps: pxa2xx-flash: fix memory leak in probe media: imon: fix a race condition in send_packet() clk: imx8mn: correct the usb1_ctrl parent to be usb_bus clk: imx: replace osc_hdmi with dummy pinctrl: pinconf-generic: add missing of_node_put() media: dvb-core: Fix ignored return value in dvb_register_frontend() media: dvb-usb: az6027: fix null-ptr-deref in az6027_i2c_xfer() media: s5p-mfc: Add variant data for MFC v7 hardware for Exynos 3250 SoC drm/tegra: Add missing clk_disable_unprepare() in tegra_dc_probe() ASoC: dt-bindings: wcd9335: fix reset line polarity in example ASoC: mediatek: mtk-btcvsd: Add checks for write and read of mtk_btcvsd_snd NFSv4.2: Clear FATTR4_WORD2_SECURITY_LABEL when done decoding NFSv4.2: Fix a memory stomp in decode_attr_security_label NFSv4.2: Fix initialisation of struct nfs4_label NFSv4: Fix a deadlock between nfs4_open_recover_helper() and delegreturn ALSA: asihpi: fix missing pci_disable_device() wifi: iwlwifi: mvm: fix double free on tx path. ASoC: mediatek: mt8173: Enable IRQ when pdata is ready drm/radeon: Fix PCI device refcount leak in radeon_atrm_get_bios() drm/amdgpu: Fix PCI device refcount leak in amdgpu_atrm_get_bios() ASoC: pcm512x: Fix PM disable depth imbalance in pcm512x_probe netfilter: conntrack: set icmpv6 redirects as RELATED bpf, sockmap: Fix repeated calls to sock_put() when msg has more_data bpf, sockmap: Fix data loss caused by using apply_bytes on ingress redirect bonding: uninitialized variable in bond_miimon_inspect() spi: spidev: mask SPI_CS_HIGH in SPI_IOC_RD_MODE wifi: cfg80211: Fix not unregister reg_pdev when load_builtin_regdb_keys() fails regulator: core: fix module refcount leak in set_supply() clk: qcom: clk-krait: fix wrong div2 functions hsr: Avoid double remove of a node. configfs: fix possible memory leak in configfs_create_dir() regulator: core: fix resource leak in regulator_register() bpf, sockmap: fix race in sock_map_free() media: saa7164: fix missing pci_disable_device() ALSA: mts64: fix possible null-ptr-defer in snd_mts64_interrupt xprtrdma: Fix regbuf data not freed in rpcrdma_req_create() SUNRPC: Fix missing release socket in rpc_sockname() NFSv4.x: Fail client initialisation if state manager thread can't run mmc: alcor: fix return value check of mmc_add_host() mmc: moxart: fix return value check of mmc_add_host() mmc: mxcmmc: fix return value check of mmc_add_host() mmc: pxamci: fix return value check of mmc_add_host() mmc: rtsx_usb_sdmmc: fix return value check of mmc_add_host() mmc: toshsd: fix return value check of mmc_add_host() mmc: vub300: fix return value check of mmc_add_host() mmc: wmt-sdmmc: fix return value check of mmc_add_host() mmc: atmel-mci: fix return value check of mmc_add_host() mmc: omap_hsmmc: fix return value check of mmc_add_host() mmc: meson-gx: fix return value check of mmc_add_host() mmc: via-sdmmc: fix return value check of mmc_add_host() mmc: wbsd: fix return value check of mmc_add_host() mmc: mmci: fix return value check of mmc_add_host() media: c8sectpfe: Add of_node_put() when breaking out of loop media: coda: Add check for dcoda_iram_alloc media: coda: Add check for kmalloc clk: samsung: Fix memory leak in _samsung_clk_register_pll() spi: spi-gpio: Don't set MOSI as an input if not 3WIRE mode wifi: rtl8xxxu: Add __packed to struct rtl8723bu_c2h wifi: brcmfmac: Fix error return code in brcmf_sdio_download_firmware() blktrace: Fix output non-blktrace event when blk_classic option enabled clk: socfpga: clk-pll: Remove unused variable 'rc' clk: socfpga: use clk_hw_register for a5/c5 clk: socfpga: Fix memory leak in socfpga_gate_init() net: vmw_vsock: vmci: Check memcpy_from_msg() net: defxx: Fix missing err handling in dfx_init() net: stmmac: selftests: fix potential memleak in stmmac_test_arpoffload() drivers: net: qlcnic: Fix potential memory leak in qlcnic_sriov_init() of: overlay: fix null pointer dereferencing in find_dup_cset_node_entry() and find_dup_cset_prop() ethernet: s2io: don't call dev_kfree_skb() under spin_lock_irqsave() net: farsync: Fix kmemleak when rmmods farsync net/tunnel: wait until all sk_user_data reader finish before releasing the sock net: apple: mace: don't call dev_kfree_skb() under spin_lock_irqsave() net: apple: bmac: don't call dev_kfree_skb() under spin_lock_irqsave() net: emaclite: don't call dev_kfree_skb() under spin_lock_irqsave() net: ethernet: dnet: don't call dev_kfree_skb() under spin_lock_irqsave() hamradio: don't call dev_kfree_skb() under spin_lock_irqsave() net: amd: lance: don't call dev_kfree_skb() under spin_lock_irqsave() net: amd-xgbe: Fix logic around active and passive cables net: amd-xgbe: Check only the minimum speed for active/passive cables can: tcan4x5x: Remove invalid write in clear_interrupts net: lan9303: Fix read error execution path ntb_netdev: Use dev_kfree_skb_any() in interrupt context Bluetooth: btusb: don't call kfree_skb() under spin_lock_irqsave() Bluetooth: hci_qca: don't call kfree_skb() under spin_lock_irqsave() Bluetooth: hci_ll: don't call kfree_skb() under spin_lock_irqsave() Bluetooth: hci_h5: don't call kfree_skb() under spin_lock_irqsave() Bluetooth: hci_bcsp: don't call kfree_skb() under spin_lock_irqsave() Bluetooth: hci_core: don't call kfree_skb() under spin_lock_irqsave() Bluetooth: RFCOMM: don't call kfree_skb() under spin_lock_irqsave() stmmac: fix potential division by 0 apparmor: fix a memleak in multi_transaction_new() apparmor: fix lockdep warning when removing a namespace apparmor: Fix abi check to include v8 abi apparmor: Use pointer to struct aa_label for lbs_cred RDMA/core: Fix order of nldev_exit call f2fs: fix normal discard process RDMA/siw: Fix immediate work request flush to completion queue RDMA/nldev: Return "-EAGAIN" if the cm_id isn't from expected port RDMA/siw: Set defined status for work completion with undefined status scsi: scsi_debug: Fix a warning in resp_write_scat() crypto: ccree - swap SHA384 and SHA512 larval hashes at build time crypto: ccree - Remove debugfs when platform_driver_register failed PCI: Check for alloc failure in pci_request_irq() RDMA/hfi: Decrease PCI device reference count in error path crypto: ccree - Make cc_debugfs_global_fini() available for module init function RDMA/rxe: Fix NULL-ptr-deref in rxe_qp_do_cleanup() when socket create failed scsi: hpsa: Fix possible memory leak in hpsa_init_one() crypto: tcrypt - Fix multibuffer skcipher speed test mem leak scsi: mpt3sas: Fix possible resource leaks in mpt3sas_transport_port_add() scsi: hpsa: Fix error handling in hpsa_add_sas_host() scsi: hpsa: Fix possible memory leak in hpsa_add_sas_device() scsi: fcoe: Fix possible name leak when device_register() fails scsi: ipr: Fix WARNING in ipr_init() scsi: fcoe: Fix transport not deattached when fcoe_if_init() fails scsi: snic: Fix possible UAF in snic_tgt_create() RDMA/nldev: Add checks for nla_nest_start() in fill_stat_counter_qps() f2fs: avoid victim selection from previous victim section crypto: omap-sham - Use pm_runtime_resume_and_get() in omap_sham_probe() RDMA/hfi1: Fix error return code in parse_platform_config() orangefs: Fix sysfs not cleanup when dev init failed crypto: img-hash - Fix variable dereferenced before check 'hdev->req' hwrng: amd - Fix PCI device refcount leak hwrng: geode - Fix PCI device refcount leak IB/IPoIB: Fix queue count inconsistency for PKEY child interfaces drivers: dio: fix possible memory leak in dio_init() tty: serial: tegra: Activate RX DMA transfer by request serial: tegra: Read DMA status before terminating class: fix possible memory leak in __class_register() vfio: platform: Do not pass return buffer to ACPI _RST method uio: uio_dmem_genirq: Fix missing unlock in irq configuration uio: uio_dmem_genirq: Fix deadlock between irq config and handling usb: fotg210-udc: Fix ages old endianness issues staging: vme_user: Fix possible UAF in tsi148_dma_list_add usb: typec: Check for ops->exit instead of ops->enter in altmode_exit usb: typec: tcpci: fix of node refcount leak in tcpci_register_port() serial: amba-pl011: avoid SBSA UART accessing DMACR register serial: pl011: Do not clear RX FIFO & RX interrupt in unthrottle. serial: pch: Fix PCI device refcount leak in pch_request_dma() tty: serial: clean up stop-tx part in altera_uart_tx_chars() tty: serial: altera_uart_{r,t}x_chars() need only uart_port serial: altera_uart: fix locking in polling mode serial: sunsab: Fix error handling in sunsab_init() test_firmware: fix memory leak in test_firmware_init() misc: ocxl: fix possible name leak in ocxl_file_register_afu() misc: tifm: fix possible memory leak in tifm_7xx1_switch_media() misc: sgi-gru: fix use-after-free error in gru_set_context_option, gru_fault and gru_handle_user_call_os cxl: fix possible null-ptr-deref in cxl_guest_init_afu|adapter() cxl: fix possible null-ptr-deref in cxl_pci_init_afu|adapter() counter: stm32-lptimer-cnt: fix the check on arr and cmp registers update usb: roles: fix of node refcount leak in usb_role_switch_is_parent() usb: gadget: f_hid: optional SETUP/SET_REPORT mode usb: gadget: f_hid: fix f_hidg lifetime vs cdev usb: gadget: f_hid: fix refcount leak on error path drivers: mcb: fix resource leak in mcb_probe() mcb: mcb-parse: fix error handing in chameleon_parse_gdd() chardev: fix error handling in cdev_device_add() i2c: pxa-pci: fix missing pci_disable_device() on error in ce4100_i2c_probe staging: rtl8192u: Fix use after free in ieee80211_rx() staging: rtl8192e: Fix potential use-after-free in rtllib_rx_Monitor() vme: Fix error not catched in fake_init() i2c: ismt: Fix an out-of-bounds bug in ismt_access() usb: storage: Add check for kcalloc tracing/hist: Fix issue of losting command info in error_log samples: vfio-mdev: Fix missing pci_disable_device() in mdpy_fb_probe() fbdev: ssd1307fb: Drop optional dependency fbdev: pm2fb: fix missing pci_disable_device() fbdev: via: Fix error in via_core_init() fbdev: vermilion: decrease reference count in error path fbdev: uvesafb: Fixes an error handling path in uvesafb_probe() HSI: omap_ssi_core: fix unbalanced pm_runtime_disable() HSI: omap_ssi_core: fix possible memory leak in ssi_probe() power: supply: fix residue sysfs file in error handle route of __power_supply_register() perf trace: Return error if a system call doesn't exist perf trace: Separate 'struct syscall_fmt' definition from syscall_fmts variable perf trace: Factor out the initialization of syscal_arg_fmt->scnprintf perf trace: Add the syscall_arg_fmt pointer to syscall_arg perf trace: Allow associating scnprintf routines with well known arg names perf trace: Add a strtoul() method to 'struct syscall_arg_fmt' perf trace: Use macro RAW_SYSCALL_ARGS_NUM to replace number perf trace: Handle failure when trace point folder is missed perf symbol: correction while adjusting symbol HSI: omap_ssi_core: Fix error handling in ssi_init() power: supply: fix null pointer dereferencing in power_supply_get_battery_info RDMA/siw: Fix pointer cast warning include/uapi/linux/swab: Fix potentially missing __always_inline rtc: snvs: Allow a time difference on clock register read rtc: pcf85063: Fix reading alarm iommu/amd: Fix pci device refcount leak in ppr_notifier() iommu/fsl_pamu: Fix resource leak in fsl_pamu_probe() macintosh: fix possible memory leak in macio_add_one_device() macintosh/macio-adb: check the return value of ioremap() powerpc/52xx: Fix a resource leak in an error handling path cxl: Fix refcount leak in cxl_calc_capp_routing powerpc/xive: add missing iounmap() in error path in xive_spapr_populate_irq_data() powerpc/perf: callchain validate kernel stack pointer bounds powerpc/83xx/mpc832x_rdb: call platform_device_put() in error case in of_fsl_spi_probe() powerpc/hv-gpci: Fix hv_gpci event list selftests/powerpc: Fix resource leaks pwm: sifive: Call pwm_sifive_update_clock() while mutex is held remoteproc: sysmon: fix memory leak in qcom_add_sysmon_subdev() remoteproc: qcom_q6v5_pas: Fix missing of_node_put() in adsp_alloc_memory_region() rtc: st-lpc: Add missing clk_disable_unprepare in st_rtc_probe() rtc: pic32: Move devm_rtc_allocate_device earlier in pic32_rtc_probe() nfsd: Define the file access mode enum for tracing NFSD: Add tracepoints to NFSD's duplicate reply cache nfsd: under NFSv4.1, fix double svc_xprt_put on rpc_create failure mISDN: hfcsusb: don't call dev_kfree_skb/kfree_skb() under spin_lock_irqsave() mISDN: hfcpci: don't call dev_kfree_skb/kfree_skb() under spin_lock_irqsave() mISDN: hfcmulti: don't call dev_kfree_skb/kfree_skb() under spin_lock_irqsave() nfc: pn533: Clear nfc_target before being used r6040: Fix kmemleak in probe and remove rtc: mxc_v2: Add missing clk_disable_unprepare() openvswitch: Fix flow lookup to use unmasked key skbuff: Account for tail adjustment during pull operations mailbox: zynq-ipi: fix error handling while device_register() fails net_sched: reject TCF_EM_SIMPLE case for complex ematch module rxrpc: Fix missing unlock in rxrpc_do_sendmsg() myri10ge: Fix an error handling path in myri10ge_probe() net: stream: purge sk_error_queue in sk_stream_kill_queues() rcu: Fix __this_cpu_read() lockdep warning in rcu_force_quiescent_state() binfmt_misc: fix shift-out-of-bounds in check_special_flags fs: jfs: fix shift-out-of-bounds in dbAllocAG udf: Avoid double brelse() in udf_rename() fs: jfs: fix shift-out-of-bounds in dbDiscardAG ACPICA: Fix error code path in acpi_ds_call_control_method() nilfs2: fix shift-out-of-bounds/overflow in nilfs_sb2_bad_offset() acct: fix potential integer overflow in encode_comp_t() hfs: fix OOB Read in __hfs_brec_find drm/etnaviv: add missing quirks for GC300 brcmfmac: return error when getting invalid max_flowrings from dongle wifi: ath9k: verify the expected usb_endpoints are present wifi: ar5523: Fix use-after-free on ar5523_cmd() timed out ASoC: codecs: rt298: Add quirk for KBL-R RVP platform ipmi: fix memleak when unload ipmi driver bpf: make sure skb->len != 0 when redirecting to a tunneling device net: ethernet: ti: Fix return type of netcp_ndo_start_xmit() hamradio: baycom_epp: Fix return type of baycom_send_packet() wifi: brcmfmac: Fix potential shift-out-of-bounds in brcmf_fw_alloc_request() igb: Do not free q_vector unless new one was allocated s390/ctcm: Fix return type of ctc{mp,}m_tx() s390/netiucv: Fix return type of netiucv_tx() s390/lcs: Fix return type of lcs_start_xmit() drm/rockchip: Use drm_mode_copy() drm/sti: Use drm_mode_copy() drivers/md/md-bitmap: check the return value of md_bitmap_get_counter() md/raid1: stop mdx_raid1 thread when raid1 array run failed net: add atomic_long_t to net_device_stats fields mrp: introduce active flags to prevent UAF when applicant uninit ppp: associate skb with a device at tx bpf: Prevent decl_tag from being referenced in func_proto arg media: dvb-frontends: fix leak of memory fw media: dvbdev: adopts refcnt to avoid UAF media: dvb-usb: fix memory leak in dvb_usb_adapter_init() blk-mq: fix possible memleak when register 'hctx' failed regulator: core: fix use_count leakage when handling boot-on mmc: f-sdh30: Add quirks for broken timeout clock capability media: si470x: Fix use-after-free in si470x_int_in_callback() clk: st: Fix memory leak in st_of_quadfs_setup() hugetlbfs: fix null-ptr-deref in hugetlbfs_parse_param() drm/fsl-dcu: Fix return type of fsl_dcu_drm_connector_mode_valid() drm/sti: Fix return type of sti_{dvo,hda,hdmi}_connector_mode_valid() orangefs: Fix kmemleak in orangefs_prepare_debugfs_help_string() orangefs: Fix kmemleak in orangefs_{kernel,client}_debug_init() ALSA/ASoC: hda: move/rename snd_hdac_ext_stop_streams to hdac_stream.c ALSA: hda: add snd_hdac_stop_streams() helper ASoC: Intel: Skylake: Fix driver hang during shutdown ASoC: mediatek: mt8173-rt5650-rt5514: fix refcount leak in mt8173_rt5650_rt5514_dev_probe() ASoC: audio-graph-card: fix refcount leak of cpu_ep in __graph_for_each_link() ASoC: rockchip: pdm: Add missing clk_disable_unprepare() in rockchip_pdm_runtime_resume() ASoC: wm8994: Fix potential deadlock ASoC: rockchip: spdif: Add missing clk_disable_unprepare() in rk_spdif_runtime_resume() ASoC: rt5670: Remove unbalanced pm_runtime_put() pstore: Switch pmsg_lock to an rt_mutex to avoid priority inversion pstore: Make sure CONFIG_PSTORE_PMSG selects CONFIG_RT_MUTEXES ALSA: hda/realtek: Add quirk for Lenovo TianYi510Pro-14IOB ALSA: hda/hdmi: Add HP Device 0x8711 to force connect list usb: dwc3: core: defer probe on ulpi_read_id timeout HID: wacom: Ensure bootloader PID is usable in hidraw mode reiserfs: Add missing calls to reiserfs_security_free() iio: adc: ad_sigma_delta: do not use internal iio_dev lock iio: adc128s052: add proper .data members in adc128_of_match table regulator: core: fix deadlock on regulator enable gcov: add support for checksum field media: dvbdev: fix build warning due to comments media: dvbdev: fix refcnt bug cifs: fix oops during encryption nvme-pci: fix doorbell buffer value endianness ata: ahci: Fix PCS quirk application for suspend nvme: resync include/linux/nvme.h with nvmecli nvme: fix the NVME_CMD_EFFECTS_CSE_MASK definition objtool: Fix SEGFAULT powerpc/rtas: avoid device tree lookups in rtas_os_term() powerpc/rtas: avoid scheduling in rtas_os_term() HID: multitouch: fix Asus ExpertBook P2 P2451FA trackpoint HID: plantronics: Additional PIDs for double volume key presses quirk hfsplus: fix bug causing custom uid and gid being unable to be assigned with mount ovl: Use ovl mounter's fsuid and fsgid in ovl_link() ALSA: line6: correct midi status byte when receiving data from podxt ALSA: line6: fix stack overflow in line6_midi_transmit pnode: terminate at peers of source md: fix a crash in mempool_free mm, compaction: fix fast_isolate_around() to stay within boundaries f2fs: should put a page when checking the summary info mmc: vub300: fix warning - do not call blocking ops when !TASK_RUNNING tpm: tpm_crb: Add the missed acpi_put_table() to fix memory leak tpm: tpm_tis: Add the missed acpi_put_table() to fix memory leak SUNRPC: Don't leak netobj memory when gss_read_proxy_verf() fails net/af_packet: add VLAN support for AF_PACKET SOCK_RAW GSO net/af_packet: make sure to pull mac header media: stv0288: use explicitly signed char soc: qcom: Select REMAP_MMIO for LLCC driver kest.pl: Fix grub2 menu handling for rebooting ktest.pl minconfig: Unset configs instead of just removing them mmc: sdhci-sprd: Disable CLK_AUTO when the clock is less than 400K btrfs: fix resolving backrefs for inline extent followed by prealloc ARM: ux500: do not directly dereference __iomem arm64: dts: qcom: sdm850-lenovo-yoga-c630: correct I2C12 pins drive strength selftests: Use optional USERCFLAGS and USERLDFLAGS cpufreq: Init completion before kobject_init_and_add() binfmt: Move install_exec_creds after setup_new_exec to match binfmt_elf binfmt: Fix error return code in load_elf_fdpic_binary() dm cache: Fix ABBA deadlock between shrink_slab and dm_cache_metadata_abort dm thin: Fix ABBA deadlock between shrink_slab and dm_pool_abort_metadata dm thin: Use last transaction's pmd->root when commit failed dm thin: Fix UAF in run_timer_softirq() dm integrity: Fix UAF in dm_integrity_dtr() dm clone: Fix UAF in clone_dtr() dm cache: Fix UAF in destroy() dm cache: set needs_check flag after aborting metadata tracing/hist: Fix out-of-bound write on 'action_data.var_ref_idx' x86/microcode/intel: Do not retry microcode reloading on the APs tracing/hist: Fix wrong return value in parse_action_params() tracing: Fix infinite loop in tracing_read_pipe on overflowed print_trace_line ARM: 9256/1: NWFPE: avoid compiler-generated __aeabi_uldivmod media: dvb-core: Fix double free in dvb_register_device() media: dvb-core: Fix UAF due to refcount races at releasing cifs: fix confusing debug message cifs: fix missing display of three mount options md/bitmap: Fix bitmap chunk size overflow issues efi: Add iMac Pro 2017 to uefi skip cert quirk ipmi: fix long wait in unload when IPMI disconnect mtd: spi-nor: Check for zero erase size in spi_nor_find_best_erase_type() ima: Fix a potential NULL pointer access in ima_restore_measurement_list ipmi: fix use after free in _ipmi_destroy_user() PCI: Fix pci_device_is_present() for VFs by checking PF PCI/sysfs: Fix double free in error path crypto: n2 - add missing hash statesize iommu/amd: Fix ivrs_acpihid cmdline parsing code parisc: led: Fix potential null-ptr-deref in start_task() device_cgroup: Roll back to original exceptions after copy failure drm/connector: send hotplug uevent on connector cleanup drm/vmwgfx: Validate the box size for the snooped cursor ext4: add inode table check in __ext4_get_inode_loc to aovid possible infinite loop ext4: fix undefined behavior in bit shift for ext4_check_flag_values ext4: add EXT4_IGET_BAD flag to prevent unexpected bad inode ext4: add helper to check quota inums ext4: fix reserved cluster accounting in __es_remove_extent() ext4: fix bug_on in __es_tree_search caused by bad boot loader inode ext4: init quota for 'old.inode' in 'ext4_rename' ext4: fix delayed allocation bug in ext4_clu_mapped for bigalloc + inline ext4: fix corruption when online resizing a 1K bigalloc fs ext4: fix error code return to user-space in ext4_get_branch() ext4: avoid BUG_ON when creating xattrs ext4: fix inode leak in ext4_xattr_inode_create() on an error path ext4: initialize quota before expanding inode in setproject ioctl ext4: avoid unaccounted block allocation when expanding inode ext4: allocate extended attribute value in vmalloc area btrfs: replace strncpy() with strscpy() PM/devfreq: governor: Add a private governor_data for governor media: s5p-mfc: Fix to handle reference queue during finishing media: s5p-mfc: Clear workbit to handle error condition media: s5p-mfc: Fix in register read and write for H264 dm thin: resume even if in FAIL mode perf probe: Use dwarf_attr_integrate as generic DWARF attr accessor perf probe: Fix to get the DW_AT_decl_file and DW_AT_call_file as unsinged data KVM: x86: optimize more exit handlers in vmx.c KVM: retpolines: x86: eliminate retpoline from vmx.c exit handlers KVM: VMX: Rename INTERRUPT_PENDING to INTERRUPT_WINDOW KVM: VMX: Rename NMI_PENDING to NMI_WINDOW KVM: VMX: Fix the spelling of CPU_BASED_USE_TSC_OFFSETTING KVM: nVMX: Properly expose ENABLE_USR_WAIT_PAUSE control to L1 ravb: Fix "failed to switch device to config mode" message during unbind ext4: goto right label 'failed_mount3a' ext4: correct inconsistent error msg in nojournal mode mm/highmem: Lift memcpy_[to|from]_page to core ext4: use memcpy_to_page() in pagecache_write() fs: ext4: initialize fsdata in pagecache_write() ext4: use kmemdup() to replace kmalloc + memcpy mbcache: don't reclaim used entries mbcache: add functions to delete entry if unused ext4: remove EA inode entry from mbcache on inode eviction ext4: unindent codeblock in ext4_xattr_block_set() ext4: fix race when reusing xattr blocks mbcache: automatically delete entries from cache on freeing ext4: fix deadlock due to mbcache entry corruption SUNRPC: ensure the matching upcall is in-flight upon downcall bpf: pull before calling skb_postpull_rcsum() nfsd: shut down the NFSv4 state objects before the filecache net: hns3: add interrupts re-initialization while doing VF FLR net: sched: fix memory leak in tcindex_set_parms qlcnic: prevent ->dcb use-after-free on qlcnic_dcb_enable() failure nfc: Fix potential resource leaks vhost: fix range used in translate_desc() net: amd-xgbe: add missed tasklet_kill net: phy: xgmiitorgmii: Fix refcount leak in xgmiitorgmii_probe RDMA/uverbs: Silence shiftTooManyBitsSigned warning RDMA/mlx5: Fix validation of max_rd_atomic caps for DC net: sched: atm: dont intepret cls results when asked to drop net: sched: cbq: dont intepret cls results when asked to drop perf tools: Fix resources leak in perf_data__open_dir() drivers/net/bonding/bond_3ad: return when there's no aggregator usb: rndis_host: Secure rndis_query check against int overflow drm/i915: unpin on error in intel_vgpu_shadow_mm_pin() caif: fix memory leak in cfctrl_linkup_request() udf: Fix extension of the last extent in the file ASoC: Intel: bytcr_rt5640: Add quirk for the Advantech MICA-071 tablet x86/bugs: Flush IBP in ib_prctl_set() nfsd: fix handling of readdir in v4root vs. mount upcall timeout riscv: uaccess: fix type of 0 variable on error in get_user() ext4: don't allow journal inode to have encrypt flag hfs/hfsplus: use WARN_ON for sanity check hfs/hfsplus: avoid WARN_ON() for sanity check, use proper error handling mbcache: Avoid nesting of cache->c_list_lock under bit locks parisc: Align parisc MADV_XXX constants with all other architectures selftests: Fix kselftest O=objdir build from cluttering top level objdir selftests: set the BUILD variable to absolute path driver core: Fix bus_type.match() error handling in __driver_attach() net: sched: disallow noqueue for qdisc classes KVM: arm64: Fix S1PTW handling on RO memslots efi: tpm: Avoid READ_ONCE() for accessing the event log docs: Fix the docs build with Sphinx 6.0 perf auxtrace: Fix address filter duplicate symbol selection s390/kexec: fix ipl report address for kdump s390/percpu: add READ_ONCE() to arch_this_cpu_to_op_simple() net/ulp: prevent ULP without clone op from entering the LISTEN status ALSA: pcm: Move rwsem lock inside snd_ctl_elem_read to prevent UAF ALSA: hda/hdmi: Add a HP device 0x8715 to force connect list cifs: Fix uninitialized memory read for smb311 posix symlink create drm/msm/adreno: Make adreno quirks not overwrite each other platform/x86: sony-laptop: Don't turn off 0x153 keyboard backlight during probe ixgbe: fix pci device refcount leak ipv6: raw: Deduct extension header length in rawv6_push_pending_frames wifi: wilc1000: sdio: fix module autoloading usb: ulpi: defer ulpi_register on ulpi_read_id timeout jbd2: use the correct print format quota: Factor out setup of quota inode ext4: fix bug_on in __es_tree_search caused by bad quota inode ext4: lost matching-pair of trace in ext4_truncate ext4: fix use-after-free in ext4_orphan_cleanup ext4: fix uninititialized value in 'ext4_evict_inode' netfilter: ipset: Fix overflow before widen in the bitmap_ip_create() function. powerpc/imc-pmu: Fix use of mutex in IRQs disabled section x86/boot: Avoid using Intel mnemonics in AT&T syntax asm EDAC/device: Fix period calculation in edac_device_reset_delay_period() regulator: da9211: Use irq handler when ready tipc: improve throughput between nodes in netns tipc: eliminate checking netns if node established tipc: fix unexpected link reset due to discovery messages hvc/xen: lock console list traversal nfc: pn533: Wait for out_urb's completion in pn533_usb_send_frame() net/sched: act_mpls: Fix warning during failed attribute validation net/mlx5: Rename ptp clock info net/mlx5: Fix ptp max frequency adjustment range iommu/mediatek-v1: Add error handle for mtk_iommu_probe iommu/mediatek-v1: Fix an error handling path in mtk_iommu_v1_probe() x86/resctrl: Use task_curr() instead of task_struct->on_cpu to prevent unnecessary IPI x86/resctrl: Fix task CLOSID/RMID update race drm/virtio: Fix GEM handle creation UAF arm64: atomics: format whitespace consistently arm64: atomics: remove LL/SC trampolines arm64: cmpxchg_double*: hazard against entire exchange variable efi: fix NULL-deref in init error path mm: Always release pages to the buddy allocator in memblock_free_late(). Revert "usb: ulpi: defer ulpi_register on ulpi_read_id timeout" tipc: fix use-after-free in tipc_disc_rcv() tty: serial: tegra: Handle RX transfer in PIO mode if DMA wasn't started tipc: Add a missing case of TIPC_DIRECT_MSG type ocfs2: fix freeing uninitialized resource on ocfs2_dlm_shutdown tipc: call tipc_lxc_xmit without holding node_read_lock Linux 5.4.229 Change-Id: If8e35d5d3e707352766ae3e4b665fd2369d9382b Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
1274 lines
29 KiB
C
1274 lines
29 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
*
|
|
* Copyright (C) 2011 Novell Inc.
|
|
*/
|
|
|
|
#include <linux/fs.h>
|
|
#include <linux/namei.h>
|
|
#include <linux/xattr.h>
|
|
#include <linux/security.h>
|
|
#include <linux/cred.h>
|
|
#include <linux/module.h>
|
|
#include <linux/posix_acl.h>
|
|
#include <linux/posix_acl_xattr.h>
|
|
#include <linux/atomic.h>
|
|
#include <linux/ratelimit.h>
|
|
#include "overlayfs.h"
|
|
|
|
static unsigned short ovl_redirect_max = 256;
|
|
module_param_named(redirect_max, ovl_redirect_max, ushort, 0644);
|
|
MODULE_PARM_DESC(redirect_max,
|
|
"Maximum length of absolute redirect xattr value");
|
|
|
|
static int ovl_set_redirect(struct dentry *dentry, bool samedir);
|
|
|
|
int ovl_cleanup(struct inode *wdir, struct dentry *wdentry)
|
|
{
|
|
int err;
|
|
|
|
dget(wdentry);
|
|
if (d_is_dir(wdentry))
|
|
err = ovl_do_rmdir(wdir, wdentry);
|
|
else
|
|
err = ovl_do_unlink(wdir, wdentry);
|
|
dput(wdentry);
|
|
|
|
if (err) {
|
|
pr_err("overlayfs: cleanup of '%pd2' failed (%i)\n",
|
|
wdentry, err);
|
|
}
|
|
|
|
return err;
|
|
}
|
|
|
|
static struct dentry *ovl_lookup_temp(struct dentry *workdir)
|
|
{
|
|
struct dentry *temp;
|
|
char name[20];
|
|
static atomic_t temp_id = ATOMIC_INIT(0);
|
|
|
|
/* counter is allowed to wrap, since temp dentries are ephemeral */
|
|
snprintf(name, sizeof(name), "#%x", atomic_inc_return(&temp_id));
|
|
|
|
temp = lookup_one_len(name, workdir, strlen(name));
|
|
if (!IS_ERR(temp) && temp->d_inode) {
|
|
pr_err("overlayfs: workdir/%s already exists\n", name);
|
|
dput(temp);
|
|
temp = ERR_PTR(-EIO);
|
|
}
|
|
|
|
return temp;
|
|
}
|
|
|
|
/* caller holds i_mutex on workdir */
|
|
static struct dentry *ovl_whiteout(struct dentry *workdir)
|
|
{
|
|
int err;
|
|
struct dentry *whiteout;
|
|
struct inode *wdir = workdir->d_inode;
|
|
|
|
whiteout = ovl_lookup_temp(workdir);
|
|
if (IS_ERR(whiteout))
|
|
return whiteout;
|
|
|
|
err = ovl_do_whiteout(wdir, whiteout);
|
|
if (err) {
|
|
dput(whiteout);
|
|
whiteout = ERR_PTR(err);
|
|
}
|
|
|
|
return whiteout;
|
|
}
|
|
|
|
/* Caller must hold i_mutex on both workdir and dir */
|
|
int ovl_cleanup_and_whiteout(struct dentry *workdir, struct inode *dir,
|
|
struct dentry *dentry)
|
|
{
|
|
struct inode *wdir = workdir->d_inode;
|
|
struct dentry *whiteout;
|
|
int err;
|
|
int flags = 0;
|
|
|
|
whiteout = ovl_whiteout(workdir);
|
|
err = PTR_ERR(whiteout);
|
|
if (IS_ERR(whiteout))
|
|
return err;
|
|
|
|
if (d_is_dir(dentry))
|
|
flags = RENAME_EXCHANGE;
|
|
|
|
err = ovl_do_rename(wdir, whiteout, dir, dentry, flags);
|
|
if (err)
|
|
goto kill_whiteout;
|
|
if (flags)
|
|
ovl_cleanup(wdir, dentry);
|
|
|
|
out:
|
|
dput(whiteout);
|
|
return err;
|
|
|
|
kill_whiteout:
|
|
ovl_cleanup(wdir, whiteout);
|
|
goto out;
|
|
}
|
|
|
|
int ovl_mkdir_real(struct inode *dir, struct dentry **newdentry, umode_t mode)
|
|
{
|
|
int err;
|
|
struct dentry *d, *dentry = *newdentry;
|
|
|
|
err = ovl_do_mkdir(dir, dentry, mode);
|
|
if (err)
|
|
return err;
|
|
|
|
if (likely(!d_unhashed(dentry)))
|
|
return 0;
|
|
|
|
/*
|
|
* vfs_mkdir() may succeed and leave the dentry passed
|
|
* to it unhashed and negative. If that happens, try to
|
|
* lookup a new hashed and positive dentry.
|
|
*/
|
|
d = lookup_one_len(dentry->d_name.name, dentry->d_parent,
|
|
dentry->d_name.len);
|
|
if (IS_ERR(d)) {
|
|
pr_warn("overlayfs: failed lookup after mkdir (%pd2, err=%i).\n",
|
|
dentry, err);
|
|
return PTR_ERR(d);
|
|
}
|
|
dput(dentry);
|
|
*newdentry = d;
|
|
|
|
return 0;
|
|
}
|
|
|
|
struct dentry *ovl_create_real(struct inode *dir, struct dentry *newdentry,
|
|
struct ovl_cattr *attr)
|
|
{
|
|
int err;
|
|
|
|
if (IS_ERR(newdentry))
|
|
return newdentry;
|
|
|
|
err = -ESTALE;
|
|
if (newdentry->d_inode)
|
|
goto out;
|
|
|
|
if (attr->hardlink) {
|
|
err = ovl_do_link(attr->hardlink, dir, newdentry);
|
|
} else {
|
|
switch (attr->mode & S_IFMT) {
|
|
case S_IFREG:
|
|
err = ovl_do_create(dir, newdentry, attr->mode);
|
|
break;
|
|
|
|
case S_IFDIR:
|
|
/* mkdir is special... */
|
|
err = ovl_mkdir_real(dir, &newdentry, attr->mode);
|
|
break;
|
|
|
|
case S_IFCHR:
|
|
case S_IFBLK:
|
|
case S_IFIFO:
|
|
case S_IFSOCK:
|
|
err = ovl_do_mknod(dir, newdentry, attr->mode,
|
|
attr->rdev);
|
|
break;
|
|
|
|
case S_IFLNK:
|
|
err = ovl_do_symlink(dir, newdentry, attr->link);
|
|
break;
|
|
|
|
default:
|
|
err = -EPERM;
|
|
}
|
|
}
|
|
if (!err && WARN_ON(!newdentry->d_inode)) {
|
|
/*
|
|
* Not quite sure if non-instantiated dentry is legal or not.
|
|
* VFS doesn't seem to care so check and warn here.
|
|
*/
|
|
err = -EIO;
|
|
}
|
|
out:
|
|
if (err) {
|
|
dput(newdentry);
|
|
return ERR_PTR(err);
|
|
}
|
|
return newdentry;
|
|
}
|
|
|
|
struct dentry *ovl_create_temp(struct dentry *workdir, struct ovl_cattr *attr)
|
|
{
|
|
return ovl_create_real(d_inode(workdir), ovl_lookup_temp(workdir),
|
|
attr);
|
|
}
|
|
|
|
static int ovl_set_opaque_xerr(struct dentry *dentry, struct dentry *upper,
|
|
int xerr)
|
|
{
|
|
int err;
|
|
|
|
err = ovl_check_setxattr(dentry, upper, OVL_XATTR_OPAQUE, "y", 1, xerr);
|
|
if (!err)
|
|
ovl_dentry_set_opaque(dentry);
|
|
|
|
return err;
|
|
}
|
|
|
|
static int ovl_set_opaque(struct dentry *dentry, struct dentry *upperdentry)
|
|
{
|
|
/*
|
|
* Fail with -EIO when trying to create opaque dir and upper doesn't
|
|
* support xattrs. ovl_rename() calls ovl_set_opaque_xerr(-EXDEV) to
|
|
* return a specific error for noxattr case.
|
|
*/
|
|
return ovl_set_opaque_xerr(dentry, upperdentry, -EIO);
|
|
}
|
|
|
|
/*
|
|
* Common operations required to be done after creation of file on upper.
|
|
* If @hardlink is false, then @inode is a pre-allocated inode, we may or
|
|
* may not use to instantiate the new dentry.
|
|
*/
|
|
static int ovl_instantiate(struct dentry *dentry, struct inode *inode,
|
|
struct dentry *newdentry, bool hardlink)
|
|
{
|
|
struct ovl_inode_params oip = {
|
|
.upperdentry = newdentry,
|
|
.newinode = inode,
|
|
};
|
|
|
|
ovl_dir_modified(dentry->d_parent, false);
|
|
ovl_dentry_set_upper_alias(dentry);
|
|
if (!hardlink) {
|
|
/*
|
|
* ovl_obtain_alias() can be called after ovl_create_real()
|
|
* and before we get here, so we may get an inode from cache
|
|
* with the same real upperdentry that is not the inode we
|
|
* pre-allocated. In this case we will use the cached inode
|
|
* to instantiate the new dentry.
|
|
*
|
|
* XXX: if we ever use ovl_obtain_alias() to decode directory
|
|
* file handles, need to use ovl_get_inode_locked() and
|
|
* d_instantiate_new() here to prevent from creating two
|
|
* hashed directory inode aliases.
|
|
*/
|
|
inode = ovl_get_inode(dentry->d_sb, &oip);
|
|
if (IS_ERR(inode))
|
|
return PTR_ERR(inode);
|
|
} else {
|
|
WARN_ON(ovl_inode_real(inode) != d_inode(newdentry));
|
|
dput(newdentry);
|
|
inc_nlink(inode);
|
|
}
|
|
|
|
d_instantiate(dentry, inode);
|
|
if (inode != oip.newinode) {
|
|
pr_warn_ratelimited("overlayfs: newly created inode found in cache (%pd2)\n",
|
|
dentry);
|
|
}
|
|
|
|
/* Force lookup of new upper hardlink to find its lower */
|
|
if (hardlink)
|
|
d_drop(dentry);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static bool ovl_type_merge(struct dentry *dentry)
|
|
{
|
|
return OVL_TYPE_MERGE(ovl_path_type(dentry));
|
|
}
|
|
|
|
static bool ovl_type_origin(struct dentry *dentry)
|
|
{
|
|
return OVL_TYPE_ORIGIN(ovl_path_type(dentry));
|
|
}
|
|
|
|
static int ovl_create_upper(struct dentry *dentry, struct inode *inode,
|
|
struct ovl_cattr *attr)
|
|
{
|
|
struct dentry *upperdir = ovl_dentry_upper(dentry->d_parent);
|
|
struct inode *udir = upperdir->d_inode;
|
|
struct dentry *newdentry;
|
|
int err;
|
|
|
|
if (!attr->hardlink && !IS_POSIXACL(udir))
|
|
attr->mode &= ~current_umask();
|
|
|
|
inode_lock_nested(udir, I_MUTEX_PARENT);
|
|
newdentry = ovl_create_real(udir,
|
|
lookup_one_len(dentry->d_name.name,
|
|
upperdir,
|
|
dentry->d_name.len),
|
|
attr);
|
|
err = PTR_ERR(newdentry);
|
|
if (IS_ERR(newdentry))
|
|
goto out_unlock;
|
|
|
|
if (ovl_type_merge(dentry->d_parent) && d_is_dir(newdentry)) {
|
|
/* Setting opaque here is just an optimization, allow to fail */
|
|
ovl_set_opaque(dentry, newdentry);
|
|
}
|
|
|
|
err = ovl_instantiate(dentry, inode, newdentry, !!attr->hardlink);
|
|
if (err)
|
|
goto out_cleanup;
|
|
out_unlock:
|
|
inode_unlock(udir);
|
|
return err;
|
|
|
|
out_cleanup:
|
|
ovl_cleanup(udir, newdentry);
|
|
dput(newdentry);
|
|
goto out_unlock;
|
|
}
|
|
|
|
static struct dentry *ovl_clear_empty(struct dentry *dentry,
|
|
struct list_head *list)
|
|
{
|
|
struct dentry *workdir = ovl_workdir(dentry);
|
|
struct inode *wdir = workdir->d_inode;
|
|
struct dentry *upperdir = ovl_dentry_upper(dentry->d_parent);
|
|
struct inode *udir = upperdir->d_inode;
|
|
struct path upperpath;
|
|
struct dentry *upper;
|
|
struct dentry *opaquedir;
|
|
struct kstat stat;
|
|
int err;
|
|
|
|
if (WARN_ON(!workdir))
|
|
return ERR_PTR(-EROFS);
|
|
|
|
err = ovl_lock_rename_workdir(workdir, upperdir);
|
|
if (err)
|
|
goto out;
|
|
|
|
ovl_path_upper(dentry, &upperpath);
|
|
err = vfs_getattr(&upperpath, &stat,
|
|
STATX_BASIC_STATS, AT_STATX_SYNC_AS_STAT);
|
|
if (err)
|
|
goto out_unlock;
|
|
|
|
err = -ESTALE;
|
|
if (!S_ISDIR(stat.mode))
|
|
goto out_unlock;
|
|
upper = upperpath.dentry;
|
|
if (upper->d_parent->d_inode != udir)
|
|
goto out_unlock;
|
|
|
|
opaquedir = ovl_create_temp(workdir, OVL_CATTR(stat.mode));
|
|
err = PTR_ERR(opaquedir);
|
|
if (IS_ERR(opaquedir))
|
|
goto out_unlock;
|
|
|
|
err = ovl_copy_xattr(upper, opaquedir);
|
|
if (err)
|
|
goto out_cleanup;
|
|
|
|
err = ovl_set_opaque(dentry, opaquedir);
|
|
if (err)
|
|
goto out_cleanup;
|
|
|
|
inode_lock(opaquedir->d_inode);
|
|
err = ovl_set_attr(opaquedir, &stat);
|
|
inode_unlock(opaquedir->d_inode);
|
|
if (err)
|
|
goto out_cleanup;
|
|
|
|
err = ovl_do_rename(wdir, opaquedir, udir, upper, RENAME_EXCHANGE);
|
|
if (err)
|
|
goto out_cleanup;
|
|
|
|
ovl_cleanup_whiteouts(upper, list);
|
|
ovl_cleanup(wdir, upper);
|
|
unlock_rename(workdir, upperdir);
|
|
|
|
/* dentry's upper doesn't match now, get rid of it */
|
|
d_drop(dentry);
|
|
|
|
return opaquedir;
|
|
|
|
out_cleanup:
|
|
ovl_cleanup(wdir, opaquedir);
|
|
dput(opaquedir);
|
|
out_unlock:
|
|
unlock_rename(workdir, upperdir);
|
|
out:
|
|
return ERR_PTR(err);
|
|
}
|
|
|
|
static int ovl_set_upper_acl(struct dentry *upperdentry, const char *name,
|
|
const struct posix_acl *acl)
|
|
{
|
|
void *buffer;
|
|
size_t size;
|
|
int err;
|
|
|
|
if (!IS_ENABLED(CONFIG_FS_POSIX_ACL) || !acl)
|
|
return 0;
|
|
|
|
size = posix_acl_xattr_size(acl->a_count);
|
|
buffer = kmalloc(size, GFP_KERNEL);
|
|
if (!buffer)
|
|
return -ENOMEM;
|
|
|
|
err = posix_acl_to_xattr(&init_user_ns, acl, buffer, size);
|
|
if (err < 0)
|
|
goto out_free;
|
|
|
|
err = vfs_setxattr(upperdentry, name, buffer, size, XATTR_CREATE);
|
|
out_free:
|
|
kfree(buffer);
|
|
return err;
|
|
}
|
|
|
|
static int ovl_create_over_whiteout(struct dentry *dentry, struct inode *inode,
|
|
struct ovl_cattr *cattr)
|
|
{
|
|
struct dentry *workdir = ovl_workdir(dentry);
|
|
struct inode *wdir = workdir->d_inode;
|
|
struct dentry *upperdir = ovl_dentry_upper(dentry->d_parent);
|
|
struct inode *udir = upperdir->d_inode;
|
|
struct dentry *upper;
|
|
struct dentry *newdentry;
|
|
int err;
|
|
struct posix_acl *acl, *default_acl;
|
|
bool hardlink = !!cattr->hardlink;
|
|
|
|
if (WARN_ON(!workdir))
|
|
return -EROFS;
|
|
|
|
if (!hardlink) {
|
|
err = posix_acl_create(dentry->d_parent->d_inode,
|
|
&cattr->mode, &default_acl, &acl);
|
|
if (err)
|
|
return err;
|
|
}
|
|
|
|
err = ovl_lock_rename_workdir(workdir, upperdir);
|
|
if (err)
|
|
goto out;
|
|
|
|
upper = lookup_one_len(dentry->d_name.name, upperdir,
|
|
dentry->d_name.len);
|
|
err = PTR_ERR(upper);
|
|
if (IS_ERR(upper))
|
|
goto out_unlock;
|
|
|
|
err = -ESTALE;
|
|
if (d_is_negative(upper) || !IS_WHITEOUT(d_inode(upper)))
|
|
goto out_dput;
|
|
|
|
newdentry = ovl_create_temp(workdir, cattr);
|
|
err = PTR_ERR(newdentry);
|
|
if (IS_ERR(newdentry))
|
|
goto out_dput;
|
|
|
|
/*
|
|
* mode could have been mutilated due to umask (e.g. sgid directory)
|
|
*/
|
|
if (!hardlink &&
|
|
!S_ISLNK(cattr->mode) &&
|
|
newdentry->d_inode->i_mode != cattr->mode) {
|
|
struct iattr attr = {
|
|
.ia_valid = ATTR_MODE,
|
|
.ia_mode = cattr->mode,
|
|
};
|
|
inode_lock(newdentry->d_inode);
|
|
err = notify_change(newdentry, &attr, NULL);
|
|
inode_unlock(newdentry->d_inode);
|
|
if (err)
|
|
goto out_cleanup;
|
|
}
|
|
if (!hardlink) {
|
|
err = ovl_set_upper_acl(newdentry, XATTR_NAME_POSIX_ACL_ACCESS,
|
|
acl);
|
|
if (err)
|
|
goto out_cleanup;
|
|
|
|
err = ovl_set_upper_acl(newdentry, XATTR_NAME_POSIX_ACL_DEFAULT,
|
|
default_acl);
|
|
if (err)
|
|
goto out_cleanup;
|
|
}
|
|
|
|
if (!hardlink && S_ISDIR(cattr->mode)) {
|
|
err = ovl_set_opaque(dentry, newdentry);
|
|
if (err)
|
|
goto out_cleanup;
|
|
|
|
err = ovl_do_rename(wdir, newdentry, udir, upper,
|
|
RENAME_EXCHANGE);
|
|
if (err)
|
|
goto out_cleanup;
|
|
|
|
ovl_cleanup(wdir, upper);
|
|
} else {
|
|
err = ovl_do_rename(wdir, newdentry, udir, upper, 0);
|
|
if (err)
|
|
goto out_cleanup;
|
|
}
|
|
err = ovl_instantiate(dentry, inode, newdentry, hardlink);
|
|
if (err) {
|
|
ovl_cleanup(udir, newdentry);
|
|
dput(newdentry);
|
|
}
|
|
out_dput:
|
|
dput(upper);
|
|
out_unlock:
|
|
unlock_rename(workdir, upperdir);
|
|
out:
|
|
if (!hardlink) {
|
|
posix_acl_release(acl);
|
|
posix_acl_release(default_acl);
|
|
}
|
|
return err;
|
|
|
|
out_cleanup:
|
|
ovl_cleanup(wdir, newdentry);
|
|
dput(newdentry);
|
|
goto out_dput;
|
|
}
|
|
|
|
static int ovl_create_or_link(struct dentry *dentry, struct inode *inode,
|
|
struct ovl_cattr *attr, bool origin)
|
|
{
|
|
int err;
|
|
const struct cred *old_cred, *hold_cred = NULL;
|
|
struct cred *override_cred;
|
|
struct dentry *parent = dentry->d_parent;
|
|
|
|
err = ovl_copy_up(parent);
|
|
if (err)
|
|
return err;
|
|
|
|
old_cred = ovl_override_creds(dentry->d_sb);
|
|
|
|
/*
|
|
* When linking a file with copy up origin into a new parent, mark the
|
|
* new parent dir "impure".
|
|
*/
|
|
if (origin) {
|
|
err = ovl_set_impure(parent, ovl_dentry_upper(parent));
|
|
if (err)
|
|
goto out_revert_creds;
|
|
}
|
|
|
|
if (!attr->hardlink) {
|
|
err = -ENOMEM;
|
|
override_cred = prepare_creds();
|
|
if (!override_cred)
|
|
goto out_revert_creds;
|
|
/*
|
|
* In the creation cases(create, mkdir, mknod, symlink),
|
|
* ovl should transfer current's fs{u,g}id to underlying
|
|
* fs. Because underlying fs want to initialize its new
|
|
* inode owner using current's fs{u,g}id. And in this
|
|
* case, the @inode is a new inode that is initialized
|
|
* in inode_init_owner() to current's fs{u,g}id. So use
|
|
* the inode's i_{u,g}id to override the cred's fs{u,g}id.
|
|
*
|
|
* But in the other hardlink case, ovl_link() does not
|
|
* create a new inode, so just use the ovl mounter's
|
|
* fs{u,g}id.
|
|
*/
|
|
override_cred->fsuid = inode->i_uid;
|
|
override_cred->fsgid = inode->i_gid;
|
|
err = security_dentry_create_files_as(dentry,
|
|
attr->mode, &dentry->d_name,
|
|
old_cred ? old_cred : current_cred(),
|
|
override_cred);
|
|
if (err) {
|
|
put_cred(override_cred);
|
|
goto out_revert_creds;
|
|
}
|
|
hold_cred = override_creds(override_cred);
|
|
put_cred(override_cred);
|
|
}
|
|
|
|
if (!ovl_dentry_is_whiteout(dentry))
|
|
err = ovl_create_upper(dentry, inode, attr);
|
|
else
|
|
err = ovl_create_over_whiteout(dentry, inode, attr);
|
|
|
|
out_revert_creds:
|
|
ovl_revert_creds(dentry->d_sb, old_cred ?: hold_cred);
|
|
if (old_cred && hold_cred)
|
|
put_cred(hold_cred);
|
|
return err;
|
|
}
|
|
|
|
static int ovl_create_object(struct dentry *dentry, int mode, dev_t rdev,
|
|
const char *link)
|
|
{
|
|
int err;
|
|
struct inode *inode;
|
|
struct ovl_cattr attr = {
|
|
.rdev = rdev,
|
|
.link = link,
|
|
};
|
|
|
|
err = ovl_want_write(dentry);
|
|
if (err)
|
|
goto out;
|
|
|
|
/* Preallocate inode to be used by ovl_get_inode() */
|
|
err = -ENOMEM;
|
|
inode = ovl_new_inode(dentry->d_sb, mode, rdev);
|
|
if (!inode)
|
|
goto out_drop_write;
|
|
|
|
spin_lock(&inode->i_lock);
|
|
inode->i_state |= I_CREATING;
|
|
spin_unlock(&inode->i_lock);
|
|
|
|
inode_init_owner(inode, dentry->d_parent->d_inode, mode);
|
|
attr.mode = inode->i_mode;
|
|
|
|
err = ovl_create_or_link(dentry, inode, &attr, false);
|
|
/* Did we end up using the preallocated inode? */
|
|
if (inode != d_inode(dentry))
|
|
iput(inode);
|
|
|
|
out_drop_write:
|
|
ovl_drop_write(dentry);
|
|
out:
|
|
return err;
|
|
}
|
|
|
|
static int ovl_create(struct inode *dir, struct dentry *dentry, umode_t mode,
|
|
bool excl)
|
|
{
|
|
return ovl_create_object(dentry, (mode & 07777) | S_IFREG, 0, NULL);
|
|
}
|
|
|
|
static int ovl_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
|
|
{
|
|
return ovl_create_object(dentry, (mode & 07777) | S_IFDIR, 0, NULL);
|
|
}
|
|
|
|
static int ovl_mknod(struct inode *dir, struct dentry *dentry, umode_t mode,
|
|
dev_t rdev)
|
|
{
|
|
/* Don't allow creation of "whiteout" on overlay */
|
|
if (S_ISCHR(mode) && rdev == WHITEOUT_DEV)
|
|
return -EPERM;
|
|
|
|
return ovl_create_object(dentry, mode, rdev, NULL);
|
|
}
|
|
|
|
static int ovl_symlink(struct inode *dir, struct dentry *dentry,
|
|
const char *link)
|
|
{
|
|
return ovl_create_object(dentry, S_IFLNK, 0, link);
|
|
}
|
|
|
|
static int ovl_set_link_redirect(struct dentry *dentry)
|
|
{
|
|
const struct cred *old_cred;
|
|
int err;
|
|
|
|
old_cred = ovl_override_creds(dentry->d_sb);
|
|
err = ovl_set_redirect(dentry, false);
|
|
ovl_revert_creds(dentry->d_sb, old_cred);
|
|
|
|
return err;
|
|
}
|
|
|
|
static int ovl_link(struct dentry *old, struct inode *newdir,
|
|
struct dentry *new)
|
|
{
|
|
int err;
|
|
struct inode *inode;
|
|
|
|
err = ovl_want_write(old);
|
|
if (err)
|
|
goto out;
|
|
|
|
err = ovl_copy_up(old);
|
|
if (err)
|
|
goto out_drop_write;
|
|
|
|
err = ovl_copy_up(new->d_parent);
|
|
if (err)
|
|
goto out_drop_write;
|
|
|
|
if (ovl_is_metacopy_dentry(old)) {
|
|
err = ovl_set_link_redirect(old);
|
|
if (err)
|
|
goto out_drop_write;
|
|
}
|
|
|
|
err = ovl_nlink_start(old);
|
|
if (err)
|
|
goto out_drop_write;
|
|
|
|
inode = d_inode(old);
|
|
ihold(inode);
|
|
|
|
err = ovl_create_or_link(new, inode,
|
|
&(struct ovl_cattr) {.hardlink = ovl_dentry_upper(old)},
|
|
ovl_type_origin(old));
|
|
if (err)
|
|
iput(inode);
|
|
|
|
ovl_nlink_end(old);
|
|
out_drop_write:
|
|
ovl_drop_write(old);
|
|
out:
|
|
return err;
|
|
}
|
|
|
|
static bool ovl_matches_upper(struct dentry *dentry, struct dentry *upper)
|
|
{
|
|
return d_inode(ovl_dentry_upper(dentry)) == d_inode(upper);
|
|
}
|
|
|
|
static int ovl_remove_and_whiteout(struct dentry *dentry,
|
|
struct list_head *list)
|
|
{
|
|
struct dentry *workdir = ovl_workdir(dentry);
|
|
struct dentry *upperdir = ovl_dentry_upper(dentry->d_parent);
|
|
struct dentry *upper;
|
|
struct dentry *opaquedir = NULL;
|
|
int err;
|
|
|
|
if (WARN_ON(!workdir))
|
|
return -EROFS;
|
|
|
|
if (!list_empty(list)) {
|
|
opaquedir = ovl_clear_empty(dentry, list);
|
|
err = PTR_ERR(opaquedir);
|
|
if (IS_ERR(opaquedir))
|
|
goto out;
|
|
}
|
|
|
|
err = ovl_lock_rename_workdir(workdir, upperdir);
|
|
if (err)
|
|
goto out_dput;
|
|
|
|
upper = lookup_one_len(dentry->d_name.name, upperdir,
|
|
dentry->d_name.len);
|
|
err = PTR_ERR(upper);
|
|
if (IS_ERR(upper))
|
|
goto out_unlock;
|
|
|
|
err = -ESTALE;
|
|
if ((opaquedir && upper != opaquedir) ||
|
|
(!opaquedir && ovl_dentry_upper(dentry) &&
|
|
!ovl_matches_upper(dentry, upper))) {
|
|
goto out_dput_upper;
|
|
}
|
|
|
|
err = ovl_cleanup_and_whiteout(workdir, d_inode(upperdir), upper);
|
|
if (err)
|
|
goto out_d_drop;
|
|
|
|
ovl_dir_modified(dentry->d_parent, true);
|
|
out_d_drop:
|
|
d_drop(dentry);
|
|
out_dput_upper:
|
|
dput(upper);
|
|
out_unlock:
|
|
unlock_rename(workdir, upperdir);
|
|
out_dput:
|
|
dput(opaquedir);
|
|
out:
|
|
return err;
|
|
}
|
|
|
|
static int ovl_remove_upper(struct dentry *dentry, bool is_dir,
|
|
struct list_head *list)
|
|
{
|
|
struct dentry *upperdir = ovl_dentry_upper(dentry->d_parent);
|
|
struct inode *dir = upperdir->d_inode;
|
|
struct dentry *upper;
|
|
struct dentry *opaquedir = NULL;
|
|
int err;
|
|
|
|
if (!list_empty(list)) {
|
|
opaquedir = ovl_clear_empty(dentry, list);
|
|
err = PTR_ERR(opaquedir);
|
|
if (IS_ERR(opaquedir))
|
|
goto out;
|
|
}
|
|
|
|
inode_lock_nested(dir, I_MUTEX_PARENT);
|
|
upper = lookup_one_len(dentry->d_name.name, upperdir,
|
|
dentry->d_name.len);
|
|
err = PTR_ERR(upper);
|
|
if (IS_ERR(upper))
|
|
goto out_unlock;
|
|
|
|
err = -ESTALE;
|
|
if ((opaquedir && upper != opaquedir) ||
|
|
(!opaquedir && !ovl_matches_upper(dentry, upper)))
|
|
goto out_dput_upper;
|
|
|
|
if (is_dir)
|
|
err = vfs_rmdir(dir, upper);
|
|
else
|
|
err = vfs_unlink(dir, upper, NULL);
|
|
ovl_dir_modified(dentry->d_parent, ovl_type_origin(dentry));
|
|
|
|
/*
|
|
* Keeping this dentry hashed would mean having to release
|
|
* upperpath/lowerpath, which could only be done if we are the
|
|
* sole user of this dentry. Too tricky... Just unhash for
|
|
* now.
|
|
*/
|
|
if (!err)
|
|
d_drop(dentry);
|
|
out_dput_upper:
|
|
dput(upper);
|
|
out_unlock:
|
|
inode_unlock(dir);
|
|
dput(opaquedir);
|
|
out:
|
|
return err;
|
|
}
|
|
|
|
static bool ovl_pure_upper(struct dentry *dentry)
|
|
{
|
|
return !ovl_dentry_lower(dentry) &&
|
|
!ovl_test_flag(OVL_WHITEOUTS, d_inode(dentry));
|
|
}
|
|
|
|
static int ovl_do_remove(struct dentry *dentry, bool is_dir)
|
|
{
|
|
int err;
|
|
const struct cred *old_cred;
|
|
struct dentry *upperdentry;
|
|
bool lower_positive = ovl_lower_positive(dentry);
|
|
LIST_HEAD(list);
|
|
|
|
/* No need to clean pure upper removed by vfs_rmdir() */
|
|
if (is_dir && (lower_positive || !ovl_pure_upper(dentry))) {
|
|
err = ovl_check_empty_dir(dentry, &list);
|
|
if (err)
|
|
goto out;
|
|
}
|
|
|
|
err = ovl_want_write(dentry);
|
|
if (err)
|
|
goto out;
|
|
|
|
err = ovl_copy_up(dentry->d_parent);
|
|
if (err)
|
|
goto out_drop_write;
|
|
|
|
err = ovl_nlink_start(dentry);
|
|
if (err)
|
|
goto out_drop_write;
|
|
|
|
old_cred = ovl_override_creds(dentry->d_sb);
|
|
if (!lower_positive)
|
|
err = ovl_remove_upper(dentry, is_dir, &list);
|
|
else
|
|
err = ovl_remove_and_whiteout(dentry, &list);
|
|
ovl_revert_creds(dentry->d_sb, old_cred);
|
|
if (!err) {
|
|
if (is_dir)
|
|
clear_nlink(dentry->d_inode);
|
|
else
|
|
drop_nlink(dentry->d_inode);
|
|
}
|
|
ovl_nlink_end(dentry);
|
|
|
|
/*
|
|
* Copy ctime
|
|
*
|
|
* Note: we fail to update ctime if there was no copy-up, only a
|
|
* whiteout
|
|
*/
|
|
upperdentry = ovl_dentry_upper(dentry);
|
|
if (upperdentry)
|
|
ovl_copyattr(d_inode(upperdentry), d_inode(dentry));
|
|
|
|
out_drop_write:
|
|
ovl_drop_write(dentry);
|
|
out:
|
|
ovl_cache_free(&list);
|
|
return err;
|
|
}
|
|
|
|
static int ovl_unlink(struct inode *dir, struct dentry *dentry)
|
|
{
|
|
return ovl_do_remove(dentry, false);
|
|
}
|
|
|
|
static int ovl_rmdir(struct inode *dir, struct dentry *dentry)
|
|
{
|
|
return ovl_do_remove(dentry, true);
|
|
}
|
|
|
|
static bool ovl_type_merge_or_lower(struct dentry *dentry)
|
|
{
|
|
enum ovl_path_type type = ovl_path_type(dentry);
|
|
|
|
return OVL_TYPE_MERGE(type) || !OVL_TYPE_UPPER(type);
|
|
}
|
|
|
|
static bool ovl_can_move(struct dentry *dentry)
|
|
{
|
|
return ovl_redirect_dir(dentry->d_sb) ||
|
|
!d_is_dir(dentry) || !ovl_type_merge_or_lower(dentry);
|
|
}
|
|
|
|
static char *ovl_get_redirect(struct dentry *dentry, bool abs_redirect)
|
|
{
|
|
char *buf, *ret;
|
|
struct dentry *d, *tmp;
|
|
int buflen = ovl_redirect_max + 1;
|
|
|
|
if (!abs_redirect) {
|
|
ret = kstrndup(dentry->d_name.name, dentry->d_name.len,
|
|
GFP_KERNEL);
|
|
goto out;
|
|
}
|
|
|
|
buf = ret = kmalloc(buflen, GFP_KERNEL);
|
|
if (!buf)
|
|
goto out;
|
|
|
|
buflen--;
|
|
buf[buflen] = '\0';
|
|
for (d = dget(dentry); !IS_ROOT(d);) {
|
|
const char *name;
|
|
int thislen;
|
|
|
|
spin_lock(&d->d_lock);
|
|
name = ovl_dentry_get_redirect(d);
|
|
if (name) {
|
|
thislen = strlen(name);
|
|
} else {
|
|
name = d->d_name.name;
|
|
thislen = d->d_name.len;
|
|
}
|
|
|
|
/* If path is too long, fall back to userspace move */
|
|
if (thislen + (name[0] != '/') > buflen) {
|
|
ret = ERR_PTR(-EXDEV);
|
|
spin_unlock(&d->d_lock);
|
|
goto out_put;
|
|
}
|
|
|
|
buflen -= thislen;
|
|
memcpy(&buf[buflen], name, thislen);
|
|
spin_unlock(&d->d_lock);
|
|
tmp = dget_parent(d);
|
|
|
|
dput(d);
|
|
d = tmp;
|
|
|
|
/* Absolute redirect: finished */
|
|
if (buf[buflen] == '/')
|
|
break;
|
|
buflen--;
|
|
buf[buflen] = '/';
|
|
}
|
|
ret = kstrdup(&buf[buflen], GFP_KERNEL);
|
|
out_put:
|
|
dput(d);
|
|
kfree(buf);
|
|
out:
|
|
return ret ? ret : ERR_PTR(-ENOMEM);
|
|
}
|
|
|
|
static bool ovl_need_absolute_redirect(struct dentry *dentry, bool samedir)
|
|
{
|
|
struct dentry *lowerdentry;
|
|
|
|
if (!samedir)
|
|
return true;
|
|
|
|
if (d_is_dir(dentry))
|
|
return false;
|
|
|
|
/*
|
|
* For non-dir hardlinked files, we need absolute redirects
|
|
* in general as two upper hardlinks could be in different
|
|
* dirs. We could put a relative redirect now and convert
|
|
* it to absolute redirect later. But when nlink > 1 and
|
|
* indexing is on, that means relative redirect needs to be
|
|
* converted to absolute during copy up of another lower
|
|
* hardllink as well.
|
|
*
|
|
* So without optimizing too much, just check if lower is
|
|
* a hard link or not. If lower is hard link, put absolute
|
|
* redirect.
|
|
*/
|
|
lowerdentry = ovl_dentry_lower(dentry);
|
|
return (d_inode(lowerdentry)->i_nlink > 1);
|
|
}
|
|
|
|
static int ovl_set_redirect(struct dentry *dentry, bool samedir)
|
|
{
|
|
int err;
|
|
const char *redirect = ovl_dentry_get_redirect(dentry);
|
|
bool absolute_redirect = ovl_need_absolute_redirect(dentry, samedir);
|
|
|
|
if (redirect && (!absolute_redirect || redirect[0] == '/'))
|
|
return 0;
|
|
|
|
redirect = ovl_get_redirect(dentry, absolute_redirect);
|
|
if (IS_ERR(redirect))
|
|
return PTR_ERR(redirect);
|
|
|
|
err = ovl_check_setxattr(dentry, ovl_dentry_upper(dentry),
|
|
OVL_XATTR_REDIRECT,
|
|
redirect, strlen(redirect), -EXDEV);
|
|
if (!err) {
|
|
spin_lock(&dentry->d_lock);
|
|
ovl_dentry_set_redirect(dentry, redirect);
|
|
spin_unlock(&dentry->d_lock);
|
|
} else {
|
|
kfree(redirect);
|
|
pr_warn_ratelimited("overlayfs: failed to set redirect (%i)\n",
|
|
err);
|
|
/* Fall back to userspace copy-up */
|
|
err = -EXDEV;
|
|
}
|
|
return err;
|
|
}
|
|
|
|
static int ovl_rename(struct inode *olddir, struct dentry *old,
|
|
struct inode *newdir, struct dentry *new,
|
|
unsigned int flags)
|
|
{
|
|
int err;
|
|
struct dentry *old_upperdir;
|
|
struct dentry *new_upperdir;
|
|
struct dentry *olddentry;
|
|
struct dentry *newdentry;
|
|
struct dentry *trap;
|
|
bool old_opaque;
|
|
bool new_opaque;
|
|
bool cleanup_whiteout = false;
|
|
bool update_nlink = false;
|
|
bool overwrite = !(flags & RENAME_EXCHANGE);
|
|
bool is_dir = d_is_dir(old);
|
|
bool new_is_dir = d_is_dir(new);
|
|
bool samedir = olddir == newdir;
|
|
struct dentry *opaquedir = NULL;
|
|
const struct cred *old_cred = NULL;
|
|
LIST_HEAD(list);
|
|
|
|
err = -EINVAL;
|
|
if (flags & ~(RENAME_EXCHANGE | RENAME_NOREPLACE))
|
|
goto out;
|
|
|
|
flags &= ~RENAME_NOREPLACE;
|
|
|
|
/* Don't copy up directory trees */
|
|
err = -EXDEV;
|
|
if (!ovl_can_move(old))
|
|
goto out;
|
|
if (!overwrite && !ovl_can_move(new))
|
|
goto out;
|
|
|
|
if (overwrite && new_is_dir && !ovl_pure_upper(new)) {
|
|
err = ovl_check_empty_dir(new, &list);
|
|
if (err)
|
|
goto out;
|
|
}
|
|
|
|
if (overwrite) {
|
|
if (ovl_lower_positive(old)) {
|
|
if (!ovl_dentry_is_whiteout(new)) {
|
|
/* Whiteout source */
|
|
flags |= RENAME_WHITEOUT;
|
|
} else {
|
|
/* Switch whiteouts */
|
|
flags |= RENAME_EXCHANGE;
|
|
}
|
|
} else if (is_dir && ovl_dentry_is_whiteout(new)) {
|
|
flags |= RENAME_EXCHANGE;
|
|
cleanup_whiteout = true;
|
|
}
|
|
}
|
|
|
|
err = ovl_want_write(old);
|
|
if (err)
|
|
goto out;
|
|
|
|
err = ovl_copy_up(old);
|
|
if (err)
|
|
goto out_drop_write;
|
|
|
|
err = ovl_copy_up(new->d_parent);
|
|
if (err)
|
|
goto out_drop_write;
|
|
if (!overwrite) {
|
|
err = ovl_copy_up(new);
|
|
if (err)
|
|
goto out_drop_write;
|
|
} else if (d_inode(new)) {
|
|
err = ovl_nlink_start(new);
|
|
if (err)
|
|
goto out_drop_write;
|
|
|
|
update_nlink = true;
|
|
}
|
|
|
|
old_cred = ovl_override_creds(old->d_sb);
|
|
|
|
if (!list_empty(&list)) {
|
|
opaquedir = ovl_clear_empty(new, &list);
|
|
err = PTR_ERR(opaquedir);
|
|
if (IS_ERR(opaquedir)) {
|
|
opaquedir = NULL;
|
|
goto out_revert_creds;
|
|
}
|
|
}
|
|
|
|
old_upperdir = ovl_dentry_upper(old->d_parent);
|
|
new_upperdir = ovl_dentry_upper(new->d_parent);
|
|
|
|
if (!samedir) {
|
|
/*
|
|
* When moving a merge dir or non-dir with copy up origin into
|
|
* a new parent, we are marking the new parent dir "impure".
|
|
* When ovl_iterate() iterates an "impure" upper dir, it will
|
|
* lookup the origin inodes of the entries to fill d_ino.
|
|
*/
|
|
if (ovl_type_origin(old)) {
|
|
err = ovl_set_impure(new->d_parent, new_upperdir);
|
|
if (err)
|
|
goto out_revert_creds;
|
|
}
|
|
if (!overwrite && ovl_type_origin(new)) {
|
|
err = ovl_set_impure(old->d_parent, old_upperdir);
|
|
if (err)
|
|
goto out_revert_creds;
|
|
}
|
|
}
|
|
|
|
trap = lock_rename(new_upperdir, old_upperdir);
|
|
|
|
olddentry = lookup_one_len(old->d_name.name, old_upperdir,
|
|
old->d_name.len);
|
|
err = PTR_ERR(olddentry);
|
|
if (IS_ERR(olddentry))
|
|
goto out_unlock;
|
|
|
|
err = -ESTALE;
|
|
if (!ovl_matches_upper(old, olddentry))
|
|
goto out_dput_old;
|
|
|
|
newdentry = lookup_one_len(new->d_name.name, new_upperdir,
|
|
new->d_name.len);
|
|
err = PTR_ERR(newdentry);
|
|
if (IS_ERR(newdentry))
|
|
goto out_dput_old;
|
|
|
|
old_opaque = ovl_dentry_is_opaque(old);
|
|
new_opaque = ovl_dentry_is_opaque(new);
|
|
|
|
err = -ESTALE;
|
|
if (d_inode(new) && ovl_dentry_upper(new)) {
|
|
if (opaquedir) {
|
|
if (newdentry != opaquedir)
|
|
goto out_dput;
|
|
} else {
|
|
if (!ovl_matches_upper(new, newdentry))
|
|
goto out_dput;
|
|
}
|
|
} else {
|
|
if (!d_is_negative(newdentry)) {
|
|
if (!new_opaque || !ovl_is_whiteout(newdentry))
|
|
goto out_dput;
|
|
} else {
|
|
if (flags & RENAME_EXCHANGE)
|
|
goto out_dput;
|
|
}
|
|
}
|
|
|
|
if (olddentry == trap)
|
|
goto out_dput;
|
|
if (newdentry == trap)
|
|
goto out_dput;
|
|
|
|
if (olddentry->d_inode == newdentry->d_inode)
|
|
goto out_dput;
|
|
|
|
err = 0;
|
|
if (ovl_type_merge_or_lower(old))
|
|
err = ovl_set_redirect(old, samedir);
|
|
else if (is_dir && !old_opaque && ovl_type_merge(new->d_parent))
|
|
err = ovl_set_opaque_xerr(old, olddentry, -EXDEV);
|
|
if (err)
|
|
goto out_dput;
|
|
|
|
if (!overwrite && ovl_type_merge_or_lower(new))
|
|
err = ovl_set_redirect(new, samedir);
|
|
else if (!overwrite && new_is_dir && !new_opaque &&
|
|
ovl_type_merge(old->d_parent))
|
|
err = ovl_set_opaque_xerr(new, newdentry, -EXDEV);
|
|
if (err)
|
|
goto out_dput;
|
|
|
|
err = ovl_do_rename(old_upperdir->d_inode, olddentry,
|
|
new_upperdir->d_inode, newdentry, flags);
|
|
if (err)
|
|
goto out_dput;
|
|
|
|
if (cleanup_whiteout)
|
|
ovl_cleanup(old_upperdir->d_inode, newdentry);
|
|
|
|
if (overwrite && d_inode(new)) {
|
|
if (new_is_dir)
|
|
clear_nlink(d_inode(new));
|
|
else
|
|
drop_nlink(d_inode(new));
|
|
}
|
|
|
|
ovl_dir_modified(old->d_parent, ovl_type_origin(old) ||
|
|
(!overwrite && ovl_type_origin(new)));
|
|
ovl_dir_modified(new->d_parent, ovl_type_origin(old) ||
|
|
(d_inode(new) && ovl_type_origin(new)));
|
|
|
|
/* copy ctime: */
|
|
ovl_copyattr(d_inode(olddentry), d_inode(old));
|
|
if (d_inode(new) && ovl_dentry_upper(new))
|
|
ovl_copyattr(d_inode(newdentry), d_inode(new));
|
|
|
|
out_dput:
|
|
dput(newdentry);
|
|
out_dput_old:
|
|
dput(olddentry);
|
|
out_unlock:
|
|
unlock_rename(new_upperdir, old_upperdir);
|
|
out_revert_creds:
|
|
ovl_revert_creds(old->d_sb, old_cred);
|
|
if (update_nlink)
|
|
ovl_nlink_end(new);
|
|
out_drop_write:
|
|
ovl_drop_write(old);
|
|
out:
|
|
dput(opaquedir);
|
|
ovl_cache_free(&list);
|
|
return err;
|
|
}
|
|
|
|
const struct inode_operations ovl_dir_inode_operations = {
|
|
.lookup = ovl_lookup,
|
|
.mkdir = ovl_mkdir,
|
|
.symlink = ovl_symlink,
|
|
.unlink = ovl_unlink,
|
|
.rmdir = ovl_rmdir,
|
|
.rename = ovl_rename,
|
|
.link = ovl_link,
|
|
.setattr = ovl_setattr,
|
|
.create = ovl_create,
|
|
.mknod = ovl_mknod,
|
|
.permission = ovl_permission,
|
|
.getattr = ovl_getattr,
|
|
.listxattr = ovl_listxattr,
|
|
.get_acl = ovl_get_acl,
|
|
.update_time = ovl_update_time,
|
|
};
|