-----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmTCEmYACgkQONu9yGCS aT5ETA/+MGhe+GasO74Gvx1MaSVJrPZgPzInUg5UoYIkf+N3BfNqH9KVrY/zFKfU mKNQSQDsli+WG8agHVzoa4lh3ZFHbiUrNx14n+3A8lZ0X5s31fqTLXRvKy9BCu4t 8OQW6nuMv22SVDd40F5ciroNmAbDquDfUQK4KbETNRPU2Yzvd5VEZiCY9aQAGFbc YnqBbx1Qc5EQKmzoBmEiup2j04SWXwMPQERKdFVZ1jrjC3hC8MFmL62YwfbCH4gY faDSZPj++/V5c++bP6oG8QhfrQS+WYGwFmEJpf4GUJ8dxxJC9Ao9CwcXbd2jOjfz Tk0gNQ9YPs+a2gexAnaHsJqKXn+dcRvkIMzmArApZv73PET0LgMv8N7s3OB5E9ei K2ft+nfXs5NCLRjPFCqL9nAeclj8ZX92B4d4mrpbqHZ+fFBiHMb0H/aGxfCAR0MJ BuW1dWQJykR2crhzQ1PJr3OthnL9O4Nl+bBAAuOu6NwqiALFW57uKXQ/2xfhPPbI qi0cTyXNYYY28kRdprERyV1w4K8W8V6L2YUt3N8LWuPNsI9pHSSQQDKru2JIR1T5 rHeC41JSR6iw8rBXtkCj1YhGbH5P8CP3fxlikuKo3Q4PHCjVJo8ZpzYU/Ci8FFCL g/g6DLb9/AHtIhJ8WgcRcxbRNkdyGUc2w9uh6c3rBVS4gwFm/44= =2pvu -----END PGP SIGNATURE----- Merge 5.10.188 into android12-5.10-lts Changes in 5.10.188 media: atomisp: fix "variable dereferenced before check 'asd'" x86/smp: Use dedicated cache-line for mwait_play_dead() can: isotp: isotp_sendmsg(): fix return error fix on TX path video: imsttfb: check for ioremap() failures fbdev: imsttfb: Fix use after free bug in imsttfb_probe HID: wacom: Use ktime_t rather than int when dealing with timestamps HID: logitech-hidpp: add HIDPP_QUIRK_DELAYED_INIT for the T651. Revert "thermal/drivers/mediatek: Use devm_of_iomap to avoid resource leak in mtk_thermal_probe" scripts/tags.sh: Resolve gtags empty index generation drm/amdgpu: Validate VM ioctl flags. nubus: Partially revert proc_create_single_data() conversion fs: pipe: reveal missing function protoypes x86/resctrl: Only show tasks' pid in current pid namespace blk-iocost: use spin_lock_irqsave in adjust_inuse_and_calc_cost md/raid10: check slab-out-of-bounds in md_bitmap_get_counter md/raid10: fix overflow of md/safe_mode_delay md/raid10: fix wrong setting of max_corr_read_errors md/raid10: fix null-ptr-deref of mreplace in raid10_sync_request md/raid10: fix io loss while replacement replace rdev irqchip/jcore-aic: Kill use of irq_create_strict_mappings() irqchip/jcore-aic: Fix missing allocation of IRQ descriptors posix-timers: Prevent RT livelock in itimer_delete() tracing/timer: Add missing hrtimer modes to decode_hrtimer_mode(). clocksource/drivers/cadence-ttc: Fix memory leak in ttc_timer_probe PM: domains: fix integer overflow issues in genpd_parse_state() perf/arm-cmn: Fix DTC reset powercap: RAPL: Fix CONFIG_IOSF_MBI dependency ARM: 9303/1: kprobes: avoid missing-declaration warnings cpufreq: intel_pstate: Fix energy_performance_preference for passive thermal/drivers/sun8i: Fix some error handling paths in sun8i_ths_probe() rcuscale: Console output claims too few grace periods rcuscale: Always log error message rcuscale: Move shutdown from wait_event() to wait_event_idle() rcu/rcuscale: Move rcu_scale_*() after kfree_scale_cleanup() rcu/rcuscale: Stop kfree_scale_thread thread(s) after unloading rcuscale perf/ibs: Fix interface via core pmu events x86/mm: Fix __swp_entry_to_pte() for Xen PV guests evm: Complete description of evm_inode_setattr() ima: Fix build warnings pstore/ram: Add check for kstrdup igc: Enable and fix RX hash usage by netstack wifi: ath9k: fix AR9003 mac hardware hang check register offset calculation wifi: ath9k: avoid referencing uninit memory in ath9k_wmi_ctrl_rx samples/bpf: Fix buffer overflow in tcp_basertt spi: spi-geni-qcom: Correct CS_TOGGLE bit in SPI_TRANS_CFG wifi: wilc1000: fix for absent RSN capabilities WFA testcase wifi: mwifiex: Fix the size of a memory allocation in mwifiex_ret_802_11_scan() bpf: Remove extra lock_sock for TCP_ZEROCOPY_RECEIVE sctp: add bpf_bypass_getsockopt proto callback libbpf: fix offsetof() and container_of() to work with CO-RE nfc: constify several pointers to u8, char and sk_buff nfc: llcp: fix possible use of uninitialized variable in nfc_llcp_send_connect() bpftool: JIT limited misreported as negative value on aarch64 regulator: core: Fix more error checking for debugfs_create_dir() regulator: core: Streamline debugfs operations wifi: orinoco: Fix an error handling path in spectrum_cs_probe() wifi: orinoco: Fix an error handling path in orinoco_cs_probe() wifi: atmel: Fix an error handling path in atmel_probe() wl3501_cs: Fix misspelling and provide missing documentation net: create netdev->dev_addr assignment helpers wl3501_cs: use eth_hw_addr_set() wifi: wl3501_cs: Fix an error handling path in wl3501_probe() wifi: ray_cs: Utilize strnlen() in parse_addr() wifi: ray_cs: Drop useless status variable in parse_addr() wifi: ray_cs: Fix an error handling path in ray_probe() wifi: ath9k: don't allow to overwrite ENDPOINT0 attributes wifi: rsi: Do not configure WoWlan in shutdown hook if not enabled wifi: rsi: Do not set MMC_PM_KEEP_POWER in shutdown watchdog/perf: define dummy watchdog_update_hrtimer_threshold() on correct config watchdog/perf: more properly prevent false positives with turbo modes kexec: fix a memory leak in crash_shrink_memory() memstick r592: make memstick_debug_get_tpc_name() static wifi: ath9k: Fix possible stall on ath9k_txq_list_has_key() rtnetlink: extend RTEXT_FILTER_SKIP_STATS to IFLA_VF_INFO wifi: iwlwifi: pull from TXQs with softirqs disabled wifi: cfg80211: rewrite merging of inherited elements wifi: ath9k: convert msecs to jiffies where needed igc: Fix race condition in PTP tx code net: stmmac: fix double serdes powerdown netlink: fix potential deadlock in netlink_set_err() netlink: do not hard code device address lenth in fdb dumps selftests: rtnetlink: remove netdevsim device after ipsec offload test gtp: Fix use-after-free in __gtp_encap_destroy(). net: axienet: Move reset before 64-bit DMA detection sfc: fix crash when reading stats while NIC is resetting nfc: llcp: simplify llcp_sock_connect() error paths net: nfc: Fix use-after-free caused by nfc_llcp_find_local lib/ts_bm: reset initial match offset for every block of text netfilter: conntrack: dccp: copy entire header to stack buffer, not just basic one netfilter: nf_conntrack_sip: fix the ct_sip_parse_numerical_param() return value. ipvlan: Fix return value of ipvlan_queue_xmit() netlink: Add __sock_i_ino() for __netlink_diag_dump(). radeon: avoid double free in ci_dpm_init() drm/amd/display: Explicitly specify update type per plane info change Input: drv260x - sleep between polling GO bit drm/bridge: tc358768: always enable HS video mode drm/bridge: tc358768: fix PLL parameters computation drm/bridge: tc358768: fix PLL target frequency drm/bridge: tc358768: fix TCLK_ZEROCNT computation drm/bridge: tc358768: Add atomic_get_input_bus_fmts() implementation drm/bridge: tc358768: fix TCLK_TRAILCNT computation drm/bridge: tc358768: fix THS_ZEROCNT computation drm/bridge: tc358768: fix TXTAGOCNT computation drm/bridge: tc358768: fix THS_TRAILCNT computation drm/vram-helper: fix function names in vram helper doc ARM: dts: BCM5301X: Drop "clock-names" from the SPI node ARM: dts: meson8b: correct uart_B and uart_C clock references Input: adxl34x - do not hardcode interrupt trigger type drm: sun4i_tcon: use devm_clk_get_enabled in `sun4i_tcon_init_clocks` drm/panel: sharp-ls043t1le01: adjust mode settings ARM: dts: stm32: Move ethernet MAC EEPROM from SoM to carrier boards bus: ti-sysc: Fix dispc quirk masking bool variables arm64: dts: microchip: sparx5: do not use PSCI on reference boards RDMA/bnxt_re: Disable/kill tasklet only if it is enabled RDMA/bnxt_re: Fix to remove unnecessary return labels RDMA/bnxt_re: Use unique names while registering interrupts RDMA/bnxt_re: Remove a redundant check inside bnxt_re_update_gid RDMA/bnxt_re: Fix to remove an unnecessary log ARM: dts: gta04: Move model property out of pinctrl node arm64: dts: qcom: msm8916: correct camss unit address arm64: dts: qcom: msm8994: correct SPMI unit address arm64: dts: qcom: msm8996: correct camss unit address drm/panel: simple: fix active size for Ampire AM-480272H3TMQW-T01H ARM: ep93xx: fix missing-prototype warnings ARM: omap2: fix missing tick_broadcast() prototype arm64: dts: qcom: apq8096: fix fixed regulator name property ARM: dts: stm32: Shorten the AV96 HDMI sound card name memory: brcmstb_dpfe: fix testing array offset after use ASoC: es8316: Increment max value for ALC Capture Target Volume control ASoC: es8316: Do not set rate constraints for unsupported MCLKs ARM: dts: meson8: correct uart_B and uart_C clock references soc/fsl/qe: fix usb.c build errors IB/hfi1: Use bitmap_zalloc() when applicable IB/hfi1: Fix sdma.h tx->num_descs off-by-one errors IB/hfi1: Fix wrong mmu_node used for user SDMA packet after invalidate RDMA: Remove uverbs_ex_cmd_mask values that are linked to functions RDMA/hns: Fix coding style issues RDMA/hns: Use refcount_t APIs for HEM RDMA/hns: Clean the hardware related code for HEM RDMA/hns: Fix hns_roce_table_get return value ARM: dts: iwg20d-q7-common: Fix backlight pwm specifier arm64: dts: renesas: ulcb-kf: Remove flow control for SCIF1 fbdev: omapfb: lcd_mipid: Fix an error handling path in mipid_spi_probe() arm64: dts: ti: k3-j7200: Fix physical address of pin ARM: dts: stm32: Fix audio routing on STM32MP15xx DHCOM PDK2 ARM: dts: stm32: fix i2s endpoint format property for stm32mp15xx-dkx hwmon: (gsc-hwmon) fix fan pwm temperature scaling hwmon: (adm1275) enable adm1272 temperature reporting hwmon: (adm1275) Allow setting sample averaging hwmon: (pmbus/adm1275) Fix problems with temperature monitoring on ADM1272 ARM: dts: BCM5301X: fix duplex-full => full-duplex drm/amdkfd: Fix potential deallocation of previously deallocated memory. drm/radeon: fix possible division-by-zero errors amdgpu: validate offset_in_bo of drm_amdgpu_gem_va RDMA/bnxt_re: wraparound mbox producer index RDMA/bnxt_re: Avoid calling wake_up threads from spin_lock context clk: imx: clk-imx8mn: fix memory leak in imx8mn_clocks_probe clk: imx: clk-imx8mp: improve error handling in imx8mp_clocks_probe() clk: tegra: tegra124-emc: Fix potential memory leak ALSA: ac97: Fix possible NULL dereference in snd_ac97_mixer drm/msm/dpu: do not enable color-management if DSPPs are not available drm/msm/dp: Free resources after unregistering them clk: vc5: check memory returned by kasprintf() clk: cdce925: check return value of kasprintf() clk: si5341: Allow different output VDD_SEL values clk: si5341: Add sysfs properties to allow checking/resetting device faults clk: si5341: return error if one synth clock registration fails clk: si5341: check return value of {devm_}kasprintf() clk: si5341: free unused memory on probe failure clk: keystone: sci-clk: check return value of kasprintf() clk: ti: clkctrl: check return value of kasprintf() drivers: meson: secure-pwrc: always enable DMA domain ovl: update of dentry revalidate flags after copy up ASoC: imx-audmix: check return value of devm_kasprintf() PCI: cadence: Fix Gen2 Link Retraining process scsi: qedf: Fix NULL dereference in error handling pinctrl: bcm2835: Handle gpiochip_add_pin_range() errors PCI/ASPM: Disable ASPM on MFD function removal to avoid use-after-free scsi: 3w-xxxx: Add error handling for initialization failure in tw_probe() PCI: pciehp: Cancel bringup sequence if card is not present PCI: ftpci100: Release the clock resources PCI: Add pci_clear_master() stub for non-CONFIG_PCI perf bench: Use unbuffered output when pipe/tee'ing to a file perf bench: Add missing setlocale() call to allow usage of %'d style formatting pinctrl: cherryview: Return correct value if pin in push-pull mode kcsan: Don't expect 64 bits atomic builtins from 32 bits architectures perf script: Fixup 'struct evsel_script' method prefix perf script: Fix allocation of evsel->priv related to per-event dump files perf dwarf-aux: Fix off-by-one in die_get_varname() pinctrl: at91-pio4: check return value of devm_kasprintf() powerpc/powernv/sriov: perform null check on iov before dereferencing iov mm: rename pud_page_vaddr to pud_pgtable and make it return pmd_t * mm: rename p4d_page_vaddr to p4d_pgtable and make it return pud_t * powerpc/book3s64/mm: Fix DirectMap stats in /proc/meminfo powerpc/mm/dax: Fix the condition when checking if altmap vmemap can cross-boundary hwrng: virtio - add an internal buffer hwrng: virtio - don't wait on cleanup hwrng: virtio - don't waste entropy hwrng: virtio - always add a pending request hwrng: virtio - Fix race on data_avail and actual data crypto: nx - fix build warnings when DEBUG_FS is not enabled modpost: fix section mismatch message for R_ARM_ABS32 modpost: fix section mismatch message for R_ARM_{PC24,CALL,JUMP24} crypto: marvell/cesa - Fix type mismatch warning modpost: fix off by one in is_executable_section() ARC: define ASM_NL and __ALIGN(_STR) outside #ifdef __ASSEMBLY__ guard NFSv4.1: freeze the session table upon receiving NFS4ERR_BADSESSION dax: Fix dax_mapping_release() use after free dax: Introduce alloc_dev_dax_id() hwrng: st - keep clock enabled while hwrng is registered io_uring: ensure IOPOLL locks around deferred work USB: serial: option: add LARA-R6 01B PIDs usb: dwc3: gadget: Propagate core init errors to UDC during pullup phy: tegra: xusb: Clear the driver reference in usb-phy dev block: fix signed int overflow in Amiga partition support block: change all __u32 annotations to __be32 in affs_hardblocks.h SUNRPC: Fix UAF in svc_tcp_listen_data_ready() w1: w1_therm: fix locking behavior in convert_t w1: fix loop in w1_fini() sh: j2: Use ioremap() to translate device tree address into kernel memory serial: 8250: omap: Fix freeing of resources on failed register clk: qcom: gcc-ipq6018: Use floor ops for sdcc clocks media: usb: Check az6007_read() return value media: videodev2.h: Fix struct v4l2_input tuner index comment media: usb: siano: Fix warning due to null work_func_t function pointer clk: qcom: reset: Allow specifying custom reset delay clk: qcom: reset: support resetting multiple bits clk: qcom: ipq6018: fix networking resets usb: dwc3: qcom: Fix potential memory leak usb: gadget: u_serial: Add null pointer check in gserial_suspend extcon: Fix kernel doc of property fields to avoid warnings extcon: Fix kernel doc of property capability fields to avoid warnings usb: phy: phy-tahvo: fix memory leak in tahvo_usb_probe() usb: hide unused usbfs_notify_suspend/resume functions serial: 8250: lock port for stop_rx() in omap8250_irq() serial: 8250: lock port for UART_IER access in omap8250_irq() kernfs: fix missing kernfs_idr_lock to remove an ID from the IDR coresight: Fix loss of connection info when a module is unloaded mfd: rt5033: Drop rt5033-battery sub-device media: venus: helpers: Fix ALIGN() of non power of two media: atomisp: gmin_platform: fix out_len in gmin_get_config_dsm_var() KVM: s390: fix KVM_S390_GET_CMMA_BITS for GFNs in memslot holes usb: dwc3: qcom: Release the correct resources in dwc3_qcom_remove() usb: dwc3: qcom: Fix an error handling path in dwc3_qcom_probe() usb: common: usb-conn-gpio: Set last role to unknown before initial detection usb: dwc3-meson-g12a: Fix an error handling path in dwc3_meson_g12a_probe() mfd: intel-lpss: Add missing check for platform_get_resource Revert "usb: common: usb-conn-gpio: Set last role to unknown before initial detection" serial: 8250_omap: Use force_suspend and resume for system suspend test_firmware: return ENOMEM instead of ENOSPC on failed memory allocation mfd: stmfx: Fix error path in stmfx_chip_init mfd: stmfx: Nullify stmfx->vdd in case of error KVM: s390: vsie: fix the length of APCB bitmap mfd: stmpe: Only disable the regulators if they are enabled phy: tegra: xusb: check return value of devm_kzalloc() pwm: imx-tpm: force 'real_period' to be zero in suspend pwm: sysfs: Do not apply state to already disabled PWMs rtc: st-lpc: Release some resources in st_rtc_probe() in case of error media: cec: i2c: ch7322: also select REGMAP sctp: fix potential deadlock on &net->sctp.addr_wq_lock Add MODULE_FIRMWARE() for FIRMWARE_TG357766. net: dsa: vsc73xx: fix MTU configuration spi: bcm-qspi: return error if neither hif_mspi nor mspi is available mailbox: ti-msgmgr: Fill non-message tx data fields with 0x0 f2fs: fix error path handling in truncate_dnode() octeontx2-af: Fix mapping for NIX block from CGX connection powerpc: allow PPC_EARLY_DEBUG_CPM only when SERIAL_CPM=y net: bridge: keep ports without IFF_UNICAST_FLT in BR_PROMISC mode tcp: annotate data races in __tcp_oow_rate_limited() xsk: Honor SO_BINDTODEVICE on bind net/sched: act_pedit: Add size check for TCA_PEDIT_PARMS_EX pptp: Fix fib lookup calls. net: dsa: tag_sja1105: fix MAC DA patching from meta frames s390/qeth: Fix vipa deletion sh: dma: Fix DMA channel offset calculation apparmor: fix missing error check for rhashtable_insert_fast i2c: xiic: Defer xiic_wakeup() and __xiic_start_xfer() in xiic_process() i2c: xiic: Don't try to handle more interrupt events after error ALSA: jack: Fix mutex call in snd_jack_report() i2c: qup: Add missing unwind goto in qup_i2c_probe() NFSD: add encoding of op_recall flag for write delegation io_uring: wait interruptibly for request completions on exit mmc: core: disable TRIM on Kingston EMMC04G-M627 mmc: core: disable TRIM on Micron MTFC4GACAJCN-1M mmc: mmci: Set PROBE_PREFER_ASYNCHRONOUS mmc: sdhci: fix DMA configure compatibility issue when 64bit DMA mode is used. bcache: fixup btree_cache_wait list damage bcache: Remove unnecessary NULL point check in node allocations bcache: Fix __bch_btree_node_alloc to make the failure behavior consistent um: Use HOST_DIR for mrproper integrity: Fix possible multiple allocation in integrity_inode_get() autofs: use flexible array in ioctl structure shmem: use ramfs_kill_sb() for kill_sb method of ramfs-based tmpfs jffs2: reduce stack usage in jffs2_build_xattr_subsystem() fs: avoid empty option when generating legacy mount string ext4: Remove ext4 locking of moved directory Revert "f2fs: fix potential corruption when moving a directory" fs: Establish locking order for unrelated directories fs: Lock moved directories btrfs: add handling for RAID1C23/DUP to btrfs_reduce_alloc_profile btrfs: fix race when deleting quota root from the dirty cow roots list ASoC: mediatek: mt8173: Fix irq error path ASoC: mediatek: mt8173: Fix snd_soc_component_initialize error path ARM: orion5x: fix d2net gpio initialization leds: trigger: netdev: Recheck NETDEV_LED_MODE_LINKUP on dev rename fs: no need to check source fanotify: disallow mount/sb marks on kernel internal pseudo fs tpm, tpm_tis: Claim locality in interrupt handler selftests/bpf: Add verifier test for PTR_TO_MEM spill block: add overflow checks for Amiga partition support sh: pgtable-3level: Fix cast to pointer from integer of different size netfilter: nf_tables: use net_generic infra for transaction data netfilter: nf_tables: add rescheduling points during loop detection walks netfilter: nf_tables: incorrect error path handling with NFT_MSG_NEWRULE netfilter: nf_tables: fix chain binding transaction logic netfilter: nf_tables: add NFT_TRANS_PREPARE_ERROR to deal with bound set/chain netfilter: nf_tables: reject unbound anonymous set before commit phase netfilter: nf_tables: reject unbound chain set before commit phase netfilter: nftables: rename set element data activation/deactivation functions netfilter: nf_tables: drop map element references from preparation phase netfilter: nf_tables: unbind non-anonymous set if rule construction fails netfilter: nf_tables: fix scheduling-while-atomic splat netfilter: conntrack: Avoid nf_ct_helper_hash uses after free netfilter: nf_tables: do not ignore genmask when looking up chain by id netfilter: nf_tables: prevent OOB access in nft_byteorder_eval wireguard: queueing: use saner cpu selection wrapping wireguard: netlink: send staged packets when setting initial private key tty: serial: fsl_lpuart: add earlycon for imx8ulp platform rcu-tasks: Mark ->trc_reader_nesting data races rcu-tasks: Mark ->trc_reader_special.b.need_qs data races rcu-tasks: Simplify trc_read_check_handler() atomic operations block/partition: fix signedness issue for Amiga partitions io_uring: Use io_schedule* in cqring wait io_uring: add reschedule point to handle_tw_list() net: lan743x: Don't sleep in atomic context workqueue: clean up WORK_* constant types, clarify masking drm/panel: simple: Add connector_type for innolux_at043tn24 drm/panel: simple: Add Powertip PH800480T013 drm_display_mode flags igc: Remove delay during TX ring configuration net/mlx5e: fix double free in mlx5e_destroy_flow_table net/mlx5e: Check for NOT_READY flag state after locking igc: set TP bit in 'supported' and 'advertising' fields of ethtool_link_ksettings scsi: qla2xxx: Fix error code in qla2x00_start_sp() net: mvneta: fix txq_map in case of txq_number==1 net/sched: cls_fw: Fix improper refcount update leads to use-after-free gve: Set default duplex configuration to full ionic: remove WARN_ON to prevent panic_on_warn net: bgmac: postpone turning IRQs off to avoid SoC hangs net: prevent skb corruption on frag list segmentation icmp6: Fix null-ptr-deref of ip6_null_entry->rt6i_idev in icmp6_dev(). udp6: fix udp6_ehashfn() typo ntb: idt: Fix error handling in idt_pci_driver_init() NTB: amd: Fix error handling in amd_ntb_pci_driver_init() ntb: intel: Fix error handling in intel_ntb_pci_driver_init() NTB: ntb_transport: fix possible memory leak while device_register() fails NTB: ntb_tool: Add check for devm_kcalloc ipv6/addrconf: fix a potential refcount underflow for idev platform/x86: wmi: remove unnecessary argument platform/x86: wmi: use guid_t and guid_equal() platform/x86: wmi: move variables platform/x86: wmi: Break possible infinite loop when parsing GUID igc: Fix launchtime before start of cycle igc: Fix inserting of empty frame for launchtime riscv: bpf: Move bpf_jit_alloc_exec() and bpf_jit_free_exec() to core riscv: bpf: Avoid breaking W^X bpf, riscv: Support riscv jit to provide bpf_line_info riscv, bpf: Fix inconsistent JIT image generation erofs: avoid infinite loop in z_erofs_do_read_page() when reading beyond EOF wifi: airo: avoid uninitialized warning in airo_get_rate() net/sched: flower: Ensure both minimum and maximum ports are specified netdevsim: fix uninitialized data in nsim_dev_trap_fa_cookie_write() net/sched: make psched_mtu() RTNL-less safe net/sched: sch_qfq: refactor parsing of netlink parameters net/sched: sch_qfq: account for stab overhead in qfq_enqueue nvme-pci: fix DMA direction of unmapping integrity data f2fs: fix to avoid NULL pointer dereference f2fs_write_end_io() pinctrl: amd: Fix mistake in handling clearing pins at startup pinctrl: amd: Detect internal GPIO0 debounce handling pinctrl: amd: Only use special debounce behavior for GPIO 0 tpm: tpm_vtpm_proxy: fix a race condition in /dev/vtpmx creation mtd: rawnand: meson: fix unaligned DMA buffers handling net: bcmgenet: Ensure MDIO unregistration has clocks enabled powerpc: Fail build if using recordmcount with binutils v2.37 misc: fastrpc: Create fastrpc scalar with correct buffer count erofs: fix compact 4B support for 16k block size MIPS: Loongson: Fix cpu_probe_loongson() again ext4: Fix reusing stale buffer heads from last failed mounting ext4: fix wrong unit use in ext4_mb_clear_bb ext4: get block from bh in ext4_free_blocks for fast commit replay ext4: fix wrong unit use in ext4_mb_new_blocks ext4: only update i_reserved_data_blocks on successful block allocation jfs: jfs_dmap: Validate db_l2nbperpage while mounting hwrng: imx-rngc - fix the timeout for init and self check PCI/PM: Avoid putting EloPOS E2/S2/H2 PCIe Ports in D3cold PCI: Add function 1 DMA alias quirk for Marvell 88SE9235 PCI: qcom: Disable write access to read only registers for IP v2.3.3 PCI: rockchip: Assert PCI Configuration Enable bit after probe PCI: rockchip: Write PCI Device ID to correct register PCI: rockchip: Add poll and timeout to wait for PHY PLLs to be locked PCI: rockchip: Fix legacy IRQ generation for RK3399 PCIe endpoint core PCI: rockchip: Use u32 variable to access 32-bit registers PCI: rockchip: Set address alignment for endpoint mode misc: pci_endpoint_test: Free IRQs before removing the device misc: pci_endpoint_test: Re-init completion for every test md/raid0: add discard support for the 'original' layout fs: dlm: return positive pid value for F_GETLK drm/atomic: Allow vblank-enabled + self-refresh "disable" drm/rockchip: vop: Leave vblank enabled in self-refresh drm/amd/display: Correct `DMUB_FW_VERSION` macro serial: atmel: don't enable IRQs prematurely tty: serial: samsung_tty: Fix a memory leak in s3c24xx_serial_getclk() in case of error tty: serial: samsung_tty: Fix a memory leak in s3c24xx_serial_getclk() when iterating clk firmware: stratix10-svc: Fix a potential resource leak in svc_create_memory_pool() ceph: don't let check_caps skip sending responses for revoke msgs xhci: Fix resume issue of some ZHAOXIN hosts xhci: Fix TRB prefetch issue of ZHAOXIN hosts xhci: Show ZHAOXIN xHCI root hub speed correctly meson saradc: fix clock divider mask length Revert "8250: add support for ASIX devices with a FIFO bug" s390/decompressor: fix misaligned symbol build error tracing/histograms: Add histograms to hist_vars if they have referenced variables samples: ftrace: Save required argument registers in sample trampolines net: ena: fix shift-out-of-bounds in exponential backoff ring-buffer: Fix deadloop issue on reading trace_pipe xtensa: ISS: fix call to split_if_spec tracing: Fix null pointer dereference in tracing_err_log_open() tracing/probes: Fix not to count error code to total length scsi: qla2xxx: Wait for io return on terminate rport scsi: qla2xxx: Array index may go out of bound scsi: qla2xxx: Fix buffer overrun scsi: qla2xxx: Fix potential NULL pointer dereference scsi: qla2xxx: Check valid rport returned by fc_bsg_to_rport() scsi: qla2xxx: Correct the index of array scsi: qla2xxx: Pointer may be dereferenced scsi: qla2xxx: Remove unused nvme_ls_waitq wait queue net/sched: sch_qfq: reintroduce lmax bound check for MTU RDMA/cma: Ensure rdma_addr_cancel() happens before issuing more requests drm/atomic: Fix potential use-after-free in nonblocking commits ALSA: hda/realtek - remove 3k pull low procedure ALSA: hda/realtek: Enable Mute LED on HP Laptop 15s-eq2xxx keys: Fix linking a duplicate key to a keyring's assoc_array perf probe: Add test for regression introduced by switch to die_get_decl_file() btrfs: fix warning when putting transaction with qgroups enabled after abort fuse: revalidate: don't invalidate if interrupted selftests: tc: set timeout to 15 minutes selftests: tc: add 'ct' action kconfig dep regmap: Drop initial version of maximum transfer length fixes regmap: Account for register length in SMBus I/O limits can: bcm: Fix UAF in bcm_proc_show() drm/client: Fix memory leak in drm_client_target_cloned drm/client: Fix memory leak in drm_client_modeset_probe ASoC: fsl_sai: Disable bit clock with transmitter ext4: correct inline offset when handling xattrs in inode body debugobjects: Recheck debug_objects_enabled before reporting nbd: Add the maximum limit of allocated index in nbd_dev_add md: fix data corruption for raid456 when reshape restart while grow up md/raid10: prevent soft lockup while flush writes posix-timers: Ensure timer ID search-loop limit is valid btrfs: add xxhash to fast checksum implementations ACPI: button: Add lid disable DMI quirk for Nextbook Ares 8A ACPI: video: Add backlight=native DMI quirk for Apple iMac11,3 ACPI: video: Add backlight=native DMI quirk for Lenovo ThinkPad X131e (3371 AMD version) arm64: set __exception_irq_entry with __irq_entry as a default arm64: mm: fix VA-range sanity check sched/fair: Don't balance task to its current running CPU wifi: ath11k: fix registration of 6Ghz-only phy without the full channel range bpf: Address KCSAN report on bpf_lru_list devlink: report devlink_port_type_warn source device wifi: wext-core: Fix -Wstringop-overflow warning in ioctl_standard_iw_point() wifi: iwlwifi: mvm: avoid baid size integer overflow igb: Fix igb_down hung on surprise removal spi: bcm63xx: fix max prepend length fbdev: imxfb: warn about invalid left/right margin pinctrl: amd: Use amd_pinconf_set() for all config options net: ethernet: ti: cpsw_ale: Fix cpsw_ale_get_field()/cpsw_ale_set_field() bridge: Add extack warning when enabling STP in netns. iavf: Fix use-after-free in free_netdev iavf: Fix out-of-bounds when setting channels on remove security: keys: Modify mismatched function name octeontx2-pf: Dont allocate BPIDs for LBK interfaces tcp: annotate data-races around tcp_rsk(req)->ts_recent net: ipv4: Use kfree_sensitive instead of kfree net:ipv6: check return value of pskb_trim() Revert "tcp: avoid the lookup process failing to get sk in ehash table" fbdev: au1200fb: Fix missing IRQ check in au1200fb_drv_probe llc: Don't drop packet from non-root netns. netfilter: nf_tables: fix spurious set element insertion failure netfilter: nf_tables: can't schedule in nft_chain_validate netfilter: nft_set_pipapo: fix improper element removal netfilter: nf_tables: skip bound chain in netns release path netfilter: nf_tables: skip bound chain on rule flush tcp: annotate data-races around tp->tcp_tx_delay tcp: annotate data-races around tp->keepalive_time tcp: annotate data-races around tp->keepalive_intvl tcp: annotate data-races around tp->keepalive_probes net: Introduce net.ipv4.tcp_migrate_req. tcp: Fix data-races around sysctl_tcp_syn(ack)?_retries. tcp: annotate data-races around icsk->icsk_syn_retries tcp: annotate data-races around tp->linger2 tcp: annotate data-races around rskq_defer_accept tcp: annotate data-races around tp->notsent_lowat tcp: annotate data-races around icsk->icsk_user_timeout tcp: annotate data-races around fastopenq.max_qlen net: phy: prevent stale pointer dereference in phy_init() tracing/histograms: Return an error if we fail to add histogram to hist_vars list tracing: Fix memory leak of iter->temp when reading trace_pipe ftrace: Store the order of pages allocated in ftrace_page ftrace: Fix possible warning on checking all pages used in ftrace_process_locs() Linux 5.10.188 Change-Id: Ibcc1adc43df5b8f649b12078eedd5d4f57de4578 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
1184 lines
28 KiB
C
1184 lines
28 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* Copyright (C) 2011 Novell Inc.
|
|
* Copyright (C) 2016 Red Hat, Inc.
|
|
*/
|
|
|
|
#include <linux/fs.h>
|
|
#include <linux/cred.h>
|
|
#include <linux/ctype.h>
|
|
#include <linux/namei.h>
|
|
#include <linux/xattr.h>
|
|
#include <linux/ratelimit.h>
|
|
#include <linux/mount.h>
|
|
#include <linux/exportfs.h>
|
|
#include "overlayfs.h"
|
|
|
|
struct ovl_lookup_data {
|
|
struct super_block *sb;
|
|
struct qstr name;
|
|
bool is_dir;
|
|
bool opaque;
|
|
bool stop;
|
|
bool last;
|
|
char *redirect;
|
|
bool metacopy;
|
|
};
|
|
|
|
static int ovl_check_redirect(struct dentry *dentry, struct ovl_lookup_data *d,
|
|
size_t prelen, const char *post)
|
|
{
|
|
int res;
|
|
char *buf;
|
|
struct ovl_fs *ofs = OVL_FS(d->sb);
|
|
|
|
buf = ovl_get_redirect_xattr(ofs, dentry, prelen + strlen(post));
|
|
if (IS_ERR_OR_NULL(buf))
|
|
return PTR_ERR(buf);
|
|
|
|
if (buf[0] == '/') {
|
|
/*
|
|
* One of the ancestor path elements in an absolute path
|
|
* lookup in ovl_lookup_layer() could have been opaque and
|
|
* that will stop further lookup in lower layers (d->stop=true)
|
|
* But we have found an absolute redirect in decendant path
|
|
* element and that should force continue lookup in lower
|
|
* layers (reset d->stop).
|
|
*/
|
|
d->stop = false;
|
|
} else {
|
|
res = strlen(buf) + 1;
|
|
memmove(buf + prelen, buf, res);
|
|
memcpy(buf, d->name.name, prelen);
|
|
}
|
|
|
|
strcat(buf, post);
|
|
kfree(d->redirect);
|
|
d->redirect = buf;
|
|
d->name.name = d->redirect;
|
|
d->name.len = strlen(d->redirect);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int ovl_acceptable(void *ctx, struct dentry *dentry)
|
|
{
|
|
/*
|
|
* A non-dir origin may be disconnected, which is fine, because
|
|
* we only need it for its unique inode number.
|
|
*/
|
|
if (!d_is_dir(dentry))
|
|
return 1;
|
|
|
|
/* Don't decode a deleted empty directory */
|
|
if (d_unhashed(dentry))
|
|
return 0;
|
|
|
|
/* Check if directory belongs to the layer we are decoding from */
|
|
return is_subdir(dentry, ((struct vfsmount *)ctx)->mnt_root);
|
|
}
|
|
|
|
/*
|
|
* Check validity of an overlay file handle buffer.
|
|
*
|
|
* Return 0 for a valid file handle.
|
|
* Return -ENODATA for "origin unknown".
|
|
* Return <0 for an invalid file handle.
|
|
*/
|
|
int ovl_check_fb_len(struct ovl_fb *fb, int fb_len)
|
|
{
|
|
if (fb_len < sizeof(struct ovl_fb) || fb_len < fb->len)
|
|
return -EINVAL;
|
|
|
|
if (fb->magic != OVL_FH_MAGIC)
|
|
return -EINVAL;
|
|
|
|
/* Treat larger version and unknown flags as "origin unknown" */
|
|
if (fb->version > OVL_FH_VERSION || fb->flags & ~OVL_FH_FLAG_ALL)
|
|
return -ENODATA;
|
|
|
|
/* Treat endianness mismatch as "origin unknown" */
|
|
if (!(fb->flags & OVL_FH_FLAG_ANY_ENDIAN) &&
|
|
(fb->flags & OVL_FH_FLAG_BIG_ENDIAN) != OVL_FH_FLAG_CPU_ENDIAN)
|
|
return -ENODATA;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static struct ovl_fh *ovl_get_fh(struct ovl_fs *ofs, struct dentry *dentry,
|
|
enum ovl_xattr ox)
|
|
{
|
|
ssize_t res;
|
|
int err;
|
|
struct ovl_fh *fh = NULL;
|
|
|
|
res = ovl_do_getxattr(ofs, dentry, ox, NULL, 0);
|
|
if (res < 0) {
|
|
if (res == -ENODATA || res == -EOPNOTSUPP)
|
|
return NULL;
|
|
goto fail;
|
|
}
|
|
/* Zero size value means "copied up but origin unknown" */
|
|
if (res == 0)
|
|
return NULL;
|
|
|
|
fh = kzalloc(res + OVL_FH_WIRE_OFFSET, GFP_KERNEL);
|
|
if (!fh)
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
res = ovl_do_getxattr(ofs, dentry, ox, fh->buf, res);
|
|
if (res < 0)
|
|
goto fail;
|
|
|
|
err = ovl_check_fb_len(&fh->fb, res);
|
|
if (err < 0) {
|
|
if (err == -ENODATA)
|
|
goto out;
|
|
goto invalid;
|
|
}
|
|
|
|
return fh;
|
|
|
|
out:
|
|
kfree(fh);
|
|
return NULL;
|
|
|
|
fail:
|
|
pr_warn_ratelimited("failed to get origin (%zi)\n", res);
|
|
goto out;
|
|
invalid:
|
|
pr_warn_ratelimited("invalid origin (%*phN)\n", (int)res, fh);
|
|
goto out;
|
|
}
|
|
|
|
struct dentry *ovl_decode_real_fh(struct ovl_fh *fh, struct vfsmount *mnt,
|
|
bool connected)
|
|
{
|
|
struct dentry *real;
|
|
int bytes;
|
|
|
|
/*
|
|
* Make sure that the stored uuid matches the uuid of the lower
|
|
* layer where file handle will be decoded.
|
|
*/
|
|
if (!uuid_equal(&fh->fb.uuid, &mnt->mnt_sb->s_uuid))
|
|
return NULL;
|
|
|
|
bytes = (fh->fb.len - offsetof(struct ovl_fb, fid));
|
|
real = exportfs_decode_fh(mnt, (struct fid *)fh->fb.fid,
|
|
bytes >> 2, (int)fh->fb.type,
|
|
connected ? ovl_acceptable : NULL, mnt);
|
|
if (IS_ERR(real)) {
|
|
/*
|
|
* Treat stale file handle to lower file as "origin unknown".
|
|
* upper file handle could become stale when upper file is
|
|
* unlinked and this information is needed to handle stale
|
|
* index entries correctly.
|
|
*/
|
|
if (real == ERR_PTR(-ESTALE) &&
|
|
!(fh->fb.flags & OVL_FH_FLAG_PATH_UPPER))
|
|
real = NULL;
|
|
return real;
|
|
}
|
|
|
|
if (ovl_dentry_weird(real)) {
|
|
dput(real);
|
|
return NULL;
|
|
}
|
|
|
|
return real;
|
|
}
|
|
|
|
static bool ovl_is_opaquedir(struct super_block *sb, struct dentry *dentry)
|
|
{
|
|
return ovl_check_dir_xattr(sb, dentry, OVL_XATTR_OPAQUE);
|
|
}
|
|
|
|
static struct dentry *ovl_lookup_positive_unlocked(const char *name,
|
|
struct dentry *base, int len,
|
|
bool drop_negative)
|
|
{
|
|
struct dentry *ret = lookup_one_len_unlocked(name, base, len);
|
|
|
|
if (!IS_ERR(ret) && d_flags_negative(smp_load_acquire(&ret->d_flags))) {
|
|
if (drop_negative && ret->d_lockref.count == 1) {
|
|
spin_lock(&ret->d_lock);
|
|
/* Recheck condition under lock */
|
|
if (d_is_negative(ret) && ret->d_lockref.count == 1)
|
|
__d_drop(ret);
|
|
spin_unlock(&ret->d_lock);
|
|
}
|
|
dput(ret);
|
|
ret = ERR_PTR(-ENOENT);
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
static int ovl_lookup_single(struct dentry *base, struct ovl_lookup_data *d,
|
|
const char *name, unsigned int namelen,
|
|
size_t prelen, const char *post,
|
|
struct dentry **ret, bool drop_negative)
|
|
{
|
|
struct dentry *this;
|
|
int err;
|
|
bool last_element = !post[0];
|
|
|
|
this = ovl_lookup_positive_unlocked(name, base, namelen, drop_negative);
|
|
if (IS_ERR(this)) {
|
|
err = PTR_ERR(this);
|
|
this = NULL;
|
|
if (err == -ENOENT || err == -ENAMETOOLONG)
|
|
goto out;
|
|
goto out_err;
|
|
}
|
|
|
|
if (ovl_dentry_weird(this)) {
|
|
/* Don't support traversing automounts and other weirdness */
|
|
err = -EREMOTE;
|
|
goto out_err;
|
|
}
|
|
if (ovl_is_whiteout(this)) {
|
|
d->stop = d->opaque = true;
|
|
goto put_and_out;
|
|
}
|
|
/*
|
|
* This dentry should be a regular file if previous layer lookup
|
|
* found a metacopy dentry.
|
|
*/
|
|
if (last_element && d->metacopy && !d_is_reg(this)) {
|
|
d->stop = true;
|
|
goto put_and_out;
|
|
}
|
|
if (!d_can_lookup(this)) {
|
|
if (d->is_dir || !last_element) {
|
|
d->stop = true;
|
|
goto put_and_out;
|
|
}
|
|
err = ovl_check_metacopy_xattr(OVL_FS(d->sb), this);
|
|
if (err < 0)
|
|
goto out_err;
|
|
|
|
d->metacopy = err;
|
|
d->stop = !d->metacopy;
|
|
if (!d->metacopy || d->last)
|
|
goto out;
|
|
} else {
|
|
if (ovl_lookup_trap_inode(d->sb, this)) {
|
|
/* Caught in a trap of overlapping layers */
|
|
err = -ELOOP;
|
|
goto out_err;
|
|
}
|
|
|
|
if (last_element)
|
|
d->is_dir = true;
|
|
if (d->last)
|
|
goto out;
|
|
|
|
if (ovl_is_opaquedir(d->sb, this)) {
|
|
d->stop = true;
|
|
if (last_element)
|
|
d->opaque = true;
|
|
goto out;
|
|
}
|
|
}
|
|
err = ovl_check_redirect(this, d, prelen, post);
|
|
if (err)
|
|
goto out_err;
|
|
out:
|
|
*ret = this;
|
|
return 0;
|
|
|
|
put_and_out:
|
|
dput(this);
|
|
this = NULL;
|
|
goto out;
|
|
|
|
out_err:
|
|
dput(this);
|
|
return err;
|
|
}
|
|
|
|
static int ovl_lookup_layer(struct dentry *base, struct ovl_lookup_data *d,
|
|
struct dentry **ret, bool drop_negative)
|
|
{
|
|
/* Counting down from the end, since the prefix can change */
|
|
size_t rem = d->name.len - 1;
|
|
struct dentry *dentry = NULL;
|
|
int err;
|
|
|
|
if (d->name.name[0] != '/')
|
|
return ovl_lookup_single(base, d, d->name.name, d->name.len,
|
|
0, "", ret, drop_negative);
|
|
|
|
while (!IS_ERR_OR_NULL(base) && d_can_lookup(base)) {
|
|
const char *s = d->name.name + d->name.len - rem;
|
|
const char *next = strchrnul(s, '/');
|
|
size_t thislen = next - s;
|
|
bool end = !next[0];
|
|
|
|
/* Verify we did not go off the rails */
|
|
if (WARN_ON(s[-1] != '/'))
|
|
return -EIO;
|
|
|
|
err = ovl_lookup_single(base, d, s, thislen,
|
|
d->name.len - rem, next, &base,
|
|
drop_negative);
|
|
dput(dentry);
|
|
if (err)
|
|
return err;
|
|
dentry = base;
|
|
if (end)
|
|
break;
|
|
|
|
rem -= thislen + 1;
|
|
|
|
if (WARN_ON(rem >= d->name.len))
|
|
return -EIO;
|
|
}
|
|
*ret = dentry;
|
|
return 0;
|
|
}
|
|
|
|
|
|
int ovl_check_origin_fh(struct ovl_fs *ofs, struct ovl_fh *fh, bool connected,
|
|
struct dentry *upperdentry, struct ovl_path **stackp)
|
|
{
|
|
struct dentry *origin = NULL;
|
|
int i;
|
|
|
|
for (i = 1; i < ofs->numlayer; i++) {
|
|
/*
|
|
* If lower fs uuid is not unique among lower fs we cannot match
|
|
* fh->uuid to layer.
|
|
*/
|
|
if (ofs->layers[i].fsid &&
|
|
ofs->layers[i].fs->bad_uuid)
|
|
continue;
|
|
|
|
origin = ovl_decode_real_fh(fh, ofs->layers[i].mnt,
|
|
connected);
|
|
if (origin)
|
|
break;
|
|
}
|
|
|
|
if (!origin)
|
|
return -ESTALE;
|
|
else if (IS_ERR(origin))
|
|
return PTR_ERR(origin);
|
|
|
|
if (upperdentry && !ovl_is_whiteout(upperdentry) &&
|
|
inode_wrong_type(d_inode(upperdentry), d_inode(origin)->i_mode))
|
|
goto invalid;
|
|
|
|
if (!*stackp)
|
|
*stackp = kmalloc(sizeof(struct ovl_path), GFP_KERNEL);
|
|
if (!*stackp) {
|
|
dput(origin);
|
|
return -ENOMEM;
|
|
}
|
|
**stackp = (struct ovl_path){
|
|
.dentry = origin,
|
|
.layer = &ofs->layers[i]
|
|
};
|
|
|
|
return 0;
|
|
|
|
invalid:
|
|
pr_warn_ratelimited("invalid origin (%pd2, ftype=%x, origin ftype=%x).\n",
|
|
upperdentry, d_inode(upperdentry)->i_mode & S_IFMT,
|
|
d_inode(origin)->i_mode & S_IFMT);
|
|
dput(origin);
|
|
return -EIO;
|
|
}
|
|
|
|
static int ovl_check_origin(struct ovl_fs *ofs, struct dentry *upperdentry,
|
|
struct ovl_path **stackp)
|
|
{
|
|
struct ovl_fh *fh = ovl_get_fh(ofs, upperdentry, OVL_XATTR_ORIGIN);
|
|
int err;
|
|
|
|
if (IS_ERR_OR_NULL(fh))
|
|
return PTR_ERR(fh);
|
|
|
|
err = ovl_check_origin_fh(ofs, fh, false, upperdentry, stackp);
|
|
kfree(fh);
|
|
|
|
if (err) {
|
|
if (err == -ESTALE)
|
|
return 0;
|
|
return err;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* Verify that @fh matches the file handle stored in xattr @name.
|
|
* Return 0 on match, -ESTALE on mismatch, < 0 on error.
|
|
*/
|
|
static int ovl_verify_fh(struct ovl_fs *ofs, struct dentry *dentry,
|
|
enum ovl_xattr ox, const struct ovl_fh *fh)
|
|
{
|
|
struct ovl_fh *ofh = ovl_get_fh(ofs, dentry, ox);
|
|
int err = 0;
|
|
|
|
if (!ofh)
|
|
return -ENODATA;
|
|
|
|
if (IS_ERR(ofh))
|
|
return PTR_ERR(ofh);
|
|
|
|
if (fh->fb.len != ofh->fb.len || memcmp(&fh->fb, &ofh->fb, fh->fb.len))
|
|
err = -ESTALE;
|
|
|
|
kfree(ofh);
|
|
return err;
|
|
}
|
|
|
|
/*
|
|
* Verify that @real dentry matches the file handle stored in xattr @name.
|
|
*
|
|
* If @set is true and there is no stored file handle, encode @real and store
|
|
* file handle in xattr @name.
|
|
*
|
|
* Return 0 on match, -ESTALE on mismatch, -ENODATA on no xattr, < 0 on error.
|
|
*/
|
|
int ovl_verify_set_fh(struct ovl_fs *ofs, struct dentry *dentry,
|
|
enum ovl_xattr ox, struct dentry *real, bool is_upper,
|
|
bool set)
|
|
{
|
|
struct inode *inode;
|
|
struct ovl_fh *fh;
|
|
int err;
|
|
|
|
fh = ovl_encode_real_fh(real, is_upper);
|
|
err = PTR_ERR(fh);
|
|
if (IS_ERR(fh)) {
|
|
fh = NULL;
|
|
goto fail;
|
|
}
|
|
|
|
err = ovl_verify_fh(ofs, dentry, ox, fh);
|
|
if (set && err == -ENODATA)
|
|
err = ovl_do_setxattr(ofs, dentry, ox, fh->buf, fh->fb.len);
|
|
if (err)
|
|
goto fail;
|
|
|
|
out:
|
|
kfree(fh);
|
|
return err;
|
|
|
|
fail:
|
|
inode = d_inode(real);
|
|
pr_warn_ratelimited("failed to verify %s (%pd2, ino=%lu, err=%i)\n",
|
|
is_upper ? "upper" : "origin", real,
|
|
inode ? inode->i_ino : 0, err);
|
|
goto out;
|
|
}
|
|
|
|
/* Get upper dentry from index */
|
|
struct dentry *ovl_index_upper(struct ovl_fs *ofs, struct dentry *index)
|
|
{
|
|
struct ovl_fh *fh;
|
|
struct dentry *upper;
|
|
|
|
if (!d_is_dir(index))
|
|
return dget(index);
|
|
|
|
fh = ovl_get_fh(ofs, index, OVL_XATTR_UPPER);
|
|
if (IS_ERR_OR_NULL(fh))
|
|
return ERR_CAST(fh);
|
|
|
|
upper = ovl_decode_real_fh(fh, ovl_upper_mnt(ofs), true);
|
|
kfree(fh);
|
|
|
|
if (IS_ERR_OR_NULL(upper))
|
|
return upper ?: ERR_PTR(-ESTALE);
|
|
|
|
if (!d_is_dir(upper)) {
|
|
pr_warn_ratelimited("invalid index upper (%pd2, upper=%pd2).\n",
|
|
index, upper);
|
|
dput(upper);
|
|
return ERR_PTR(-EIO);
|
|
}
|
|
|
|
return upper;
|
|
}
|
|
|
|
/*
|
|
* Verify that an index entry name matches the origin file handle stored in
|
|
* OVL_XATTR_ORIGIN and that origin file handle can be decoded to lower path.
|
|
* Return 0 on match, -ESTALE on mismatch or stale origin, < 0 on error.
|
|
*/
|
|
int ovl_verify_index(struct ovl_fs *ofs, struct dentry *index)
|
|
{
|
|
struct ovl_fh *fh = NULL;
|
|
size_t len;
|
|
struct ovl_path origin = { };
|
|
struct ovl_path *stack = &origin;
|
|
struct dentry *upper = NULL;
|
|
int err;
|
|
|
|
if (!d_inode(index))
|
|
return 0;
|
|
|
|
err = -EINVAL;
|
|
if (index->d_name.len < sizeof(struct ovl_fb)*2)
|
|
goto fail;
|
|
|
|
err = -ENOMEM;
|
|
len = index->d_name.len / 2;
|
|
fh = kzalloc(len + OVL_FH_WIRE_OFFSET, GFP_KERNEL);
|
|
if (!fh)
|
|
goto fail;
|
|
|
|
err = -EINVAL;
|
|
if (hex2bin(fh->buf, index->d_name.name, len))
|
|
goto fail;
|
|
|
|
err = ovl_check_fb_len(&fh->fb, len);
|
|
if (err)
|
|
goto fail;
|
|
|
|
/*
|
|
* Whiteout index entries are used as an indication that an exported
|
|
* overlay file handle should be treated as stale (i.e. after unlink
|
|
* of the overlay inode). These entries contain no origin xattr.
|
|
*/
|
|
if (ovl_is_whiteout(index))
|
|
goto out;
|
|
|
|
/*
|
|
* Verifying directory index entries are not stale is expensive, so
|
|
* only verify stale dir index if NFS export is enabled.
|
|
*/
|
|
if (d_is_dir(index) && !ofs->config.nfs_export)
|
|
goto out;
|
|
|
|
/*
|
|
* Directory index entries should have 'upper' xattr pointing to the
|
|
* real upper dir. Non-dir index entries are hardlinks to the upper
|
|
* real inode. For non-dir index, we can read the copy up origin xattr
|
|
* directly from the index dentry, but for dir index we first need to
|
|
* decode the upper directory.
|
|
*/
|
|
upper = ovl_index_upper(ofs, index);
|
|
if (IS_ERR_OR_NULL(upper)) {
|
|
err = PTR_ERR(upper);
|
|
/*
|
|
* Directory index entries with no 'upper' xattr need to be
|
|
* removed. When dir index entry has a stale 'upper' xattr,
|
|
* we assume that upper dir was removed and we treat the dir
|
|
* index as orphan entry that needs to be whited out.
|
|
*/
|
|
if (err == -ESTALE)
|
|
goto orphan;
|
|
else if (!err)
|
|
err = -ESTALE;
|
|
goto fail;
|
|
}
|
|
|
|
err = ovl_verify_fh(ofs, upper, OVL_XATTR_ORIGIN, fh);
|
|
dput(upper);
|
|
if (err)
|
|
goto fail;
|
|
|
|
/* Check if non-dir index is orphan and don't warn before cleaning it */
|
|
if (!d_is_dir(index) && d_inode(index)->i_nlink == 1) {
|
|
err = ovl_check_origin_fh(ofs, fh, false, index, &stack);
|
|
if (err)
|
|
goto fail;
|
|
|
|
if (ovl_get_nlink(ofs, origin.dentry, index, 0) == 0)
|
|
goto orphan;
|
|
}
|
|
|
|
out:
|
|
dput(origin.dentry);
|
|
kfree(fh);
|
|
return err;
|
|
|
|
fail:
|
|
pr_warn_ratelimited("failed to verify index (%pd2, ftype=%x, err=%i)\n",
|
|
index, d_inode(index)->i_mode & S_IFMT, err);
|
|
goto out;
|
|
|
|
orphan:
|
|
pr_warn_ratelimited("orphan index entry (%pd2, ftype=%x, nlink=%u)\n",
|
|
index, d_inode(index)->i_mode & S_IFMT,
|
|
d_inode(index)->i_nlink);
|
|
err = -ENOENT;
|
|
goto out;
|
|
}
|
|
|
|
static int ovl_get_index_name_fh(struct ovl_fh *fh, struct qstr *name)
|
|
{
|
|
char *n, *s;
|
|
|
|
n = kcalloc(fh->fb.len, 2, GFP_KERNEL);
|
|
if (!n)
|
|
return -ENOMEM;
|
|
|
|
s = bin2hex(n, fh->buf, fh->fb.len);
|
|
*name = (struct qstr) QSTR_INIT(n, s - n);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
/*
|
|
* Lookup in indexdir for the index entry of a lower real inode or a copy up
|
|
* origin inode. The index entry name is the hex representation of the lower
|
|
* inode file handle.
|
|
*
|
|
* If the index dentry in negative, then either no lower aliases have been
|
|
* copied up yet, or aliases have been copied up in older kernels and are
|
|
* not indexed.
|
|
*
|
|
* If the index dentry for a copy up origin inode is positive, but points
|
|
* to an inode different than the upper inode, then either the upper inode
|
|
* has been copied up and not indexed or it was indexed, but since then
|
|
* index dir was cleared. Either way, that index cannot be used to indentify
|
|
* the overlay inode.
|
|
*/
|
|
int ovl_get_index_name(struct dentry *origin, struct qstr *name)
|
|
{
|
|
struct ovl_fh *fh;
|
|
int err;
|
|
|
|
fh = ovl_encode_real_fh(origin, false);
|
|
if (IS_ERR(fh))
|
|
return PTR_ERR(fh);
|
|
|
|
err = ovl_get_index_name_fh(fh, name);
|
|
|
|
kfree(fh);
|
|
return err;
|
|
}
|
|
|
|
/* Lookup index by file handle for NFS export */
|
|
struct dentry *ovl_get_index_fh(struct ovl_fs *ofs, struct ovl_fh *fh)
|
|
{
|
|
struct dentry *index;
|
|
struct qstr name;
|
|
int err;
|
|
|
|
err = ovl_get_index_name_fh(fh, &name);
|
|
if (err)
|
|
return ERR_PTR(err);
|
|
|
|
index = lookup_positive_unlocked(name.name, ofs->indexdir, name.len);
|
|
kfree(name.name);
|
|
if (IS_ERR(index)) {
|
|
if (PTR_ERR(index) == -ENOENT)
|
|
index = NULL;
|
|
return index;
|
|
}
|
|
|
|
if (ovl_is_whiteout(index))
|
|
err = -ESTALE;
|
|
else if (ovl_dentry_weird(index))
|
|
err = -EIO;
|
|
else
|
|
return index;
|
|
|
|
dput(index);
|
|
return ERR_PTR(err);
|
|
}
|
|
|
|
struct dentry *ovl_lookup_index(struct ovl_fs *ofs, struct dentry *upper,
|
|
struct dentry *origin, bool verify)
|
|
{
|
|
struct dentry *index;
|
|
struct inode *inode;
|
|
struct qstr name;
|
|
bool is_dir = d_is_dir(origin);
|
|
int err;
|
|
|
|
err = ovl_get_index_name(origin, &name);
|
|
if (err)
|
|
return ERR_PTR(err);
|
|
|
|
index = lookup_positive_unlocked(name.name, ofs->indexdir, name.len);
|
|
if (IS_ERR(index)) {
|
|
err = PTR_ERR(index);
|
|
if (err == -ENOENT) {
|
|
index = NULL;
|
|
goto out;
|
|
}
|
|
pr_warn_ratelimited("failed inode index lookup (ino=%lu, key=%.*s, err=%i);\n"
|
|
"overlayfs: mount with '-o index=off' to disable inodes index.\n",
|
|
d_inode(origin)->i_ino, name.len, name.name,
|
|
err);
|
|
goto out;
|
|
}
|
|
|
|
inode = d_inode(index);
|
|
if (ovl_is_whiteout(index) && !verify) {
|
|
/*
|
|
* When index lookup is called with !verify for decoding an
|
|
* overlay file handle, a whiteout index implies that decode
|
|
* should treat file handle as stale and no need to print a
|
|
* warning about it.
|
|
*/
|
|
dput(index);
|
|
index = ERR_PTR(-ESTALE);
|
|
goto out;
|
|
} else if (ovl_dentry_weird(index) || ovl_is_whiteout(index) ||
|
|
inode_wrong_type(inode, d_inode(origin)->i_mode)) {
|
|
/*
|
|
* Index should always be of the same file type as origin
|
|
* except for the case of a whiteout index. A whiteout
|
|
* index should only exist if all lower aliases have been
|
|
* unlinked, which means that finding a lower origin on lookup
|
|
* whose index is a whiteout should be treated as an error.
|
|
*/
|
|
pr_warn_ratelimited("bad index found (index=%pd2, ftype=%x, origin ftype=%x).\n",
|
|
index, d_inode(index)->i_mode & S_IFMT,
|
|
d_inode(origin)->i_mode & S_IFMT);
|
|
goto fail;
|
|
} else if (is_dir && verify) {
|
|
if (!upper) {
|
|
pr_warn_ratelimited("suspected uncovered redirected dir found (origin=%pd2, index=%pd2).\n",
|
|
origin, index);
|
|
goto fail;
|
|
}
|
|
|
|
/* Verify that dir index 'upper' xattr points to upper dir */
|
|
err = ovl_verify_upper(ofs, index, upper, false);
|
|
if (err) {
|
|
if (err == -ESTALE) {
|
|
pr_warn_ratelimited("suspected multiply redirected dir found (upper=%pd2, origin=%pd2, index=%pd2).\n",
|
|
upper, origin, index);
|
|
}
|
|
goto fail;
|
|
}
|
|
} else if (upper && d_inode(upper) != inode) {
|
|
goto out_dput;
|
|
}
|
|
out:
|
|
kfree(name.name);
|
|
return index;
|
|
|
|
out_dput:
|
|
dput(index);
|
|
index = NULL;
|
|
goto out;
|
|
|
|
fail:
|
|
dput(index);
|
|
index = ERR_PTR(-EIO);
|
|
goto out;
|
|
}
|
|
|
|
/*
|
|
* Returns next layer in stack starting from top.
|
|
* Returns -1 if this is the last layer.
|
|
*/
|
|
int ovl_path_next(int idx, struct dentry *dentry, struct path *path)
|
|
{
|
|
struct ovl_entry *oe = dentry->d_fsdata;
|
|
|
|
BUG_ON(idx < 0);
|
|
if (idx == 0) {
|
|
ovl_path_upper(dentry, path);
|
|
if (path->dentry)
|
|
return oe->numlower ? 1 : -1;
|
|
idx++;
|
|
}
|
|
BUG_ON(idx > oe->numlower);
|
|
path->dentry = oe->lowerstack[idx - 1].dentry;
|
|
path->mnt = oe->lowerstack[idx - 1].layer->mnt;
|
|
|
|
return (idx < oe->numlower) ? idx + 1 : -1;
|
|
}
|
|
|
|
/* Fix missing 'origin' xattr */
|
|
static int ovl_fix_origin(struct ovl_fs *ofs, struct dentry *dentry,
|
|
struct dentry *lower, struct dentry *upper)
|
|
{
|
|
int err;
|
|
|
|
if (ovl_check_origin_xattr(ofs, upper))
|
|
return 0;
|
|
|
|
err = ovl_want_write(dentry);
|
|
if (err)
|
|
return err;
|
|
|
|
err = ovl_set_origin(dentry, lower, upper);
|
|
if (!err)
|
|
err = ovl_set_impure(dentry->d_parent, upper->d_parent);
|
|
|
|
ovl_drop_write(dentry);
|
|
return err;
|
|
}
|
|
|
|
struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry,
|
|
unsigned int flags)
|
|
{
|
|
struct ovl_entry *oe;
|
|
const struct cred *old_cred;
|
|
struct ovl_fs *ofs = dentry->d_sb->s_fs_info;
|
|
struct ovl_entry *poe = dentry->d_parent->d_fsdata;
|
|
struct ovl_entry *roe = dentry->d_sb->s_root->d_fsdata;
|
|
struct ovl_path *stack = NULL, *origin_path = NULL;
|
|
struct dentry *upperdir, *upperdentry = NULL;
|
|
struct dentry *origin = NULL;
|
|
struct dentry *index = NULL;
|
|
unsigned int ctr = 0;
|
|
struct inode *inode = NULL;
|
|
bool upperopaque = false;
|
|
char *upperredirect = NULL;
|
|
struct dentry *this;
|
|
unsigned int i;
|
|
int err;
|
|
bool uppermetacopy = false;
|
|
struct ovl_lookup_data d = {
|
|
.sb = dentry->d_sb,
|
|
.name = dentry->d_name,
|
|
.is_dir = false,
|
|
.opaque = false,
|
|
.stop = false,
|
|
.last = ofs->config.redirect_follow ? false : !poe->numlower,
|
|
.redirect = NULL,
|
|
.metacopy = false,
|
|
};
|
|
|
|
if (dentry->d_name.len > ofs->namelen)
|
|
return ERR_PTR(-ENAMETOOLONG);
|
|
|
|
old_cred = ovl_override_creds(dentry->d_sb);
|
|
upperdir = ovl_dentry_upper(dentry->d_parent);
|
|
if (upperdir) {
|
|
err = ovl_lookup_layer(upperdir, &d, &upperdentry, true);
|
|
if (err)
|
|
goto out;
|
|
|
|
if (upperdentry && upperdentry->d_flags & DCACHE_OP_REAL) {
|
|
dput(upperdentry);
|
|
err = -EREMOTE;
|
|
goto out;
|
|
}
|
|
if (upperdentry && !d.is_dir) {
|
|
/*
|
|
* Lookup copy up origin by decoding origin file handle.
|
|
* We may get a disconnected dentry, which is fine,
|
|
* because we only need to hold the origin inode in
|
|
* cache and use its inode number. We may even get a
|
|
* connected dentry, that is not under any of the lower
|
|
* layers root. That is also fine for using it's inode
|
|
* number - it's the same as if we held a reference
|
|
* to a dentry in lower layer that was moved under us.
|
|
*/
|
|
err = ovl_check_origin(ofs, upperdentry, &origin_path);
|
|
if (err)
|
|
goto out_put_upper;
|
|
|
|
if (d.metacopy)
|
|
uppermetacopy = true;
|
|
}
|
|
|
|
if (d.redirect) {
|
|
err = -ENOMEM;
|
|
upperredirect = kstrdup(d.redirect, GFP_KERNEL);
|
|
if (!upperredirect)
|
|
goto out_put_upper;
|
|
if (d.redirect[0] == '/')
|
|
poe = roe;
|
|
}
|
|
upperopaque = d.opaque;
|
|
}
|
|
|
|
if (!d.stop && poe->numlower) {
|
|
err = -ENOMEM;
|
|
stack = kcalloc(ofs->numlayer - 1, sizeof(struct ovl_path),
|
|
GFP_KERNEL);
|
|
if (!stack)
|
|
goto out_put_upper;
|
|
}
|
|
|
|
for (i = 0; !d.stop && i < poe->numlower; i++) {
|
|
struct ovl_path lower = poe->lowerstack[i];
|
|
|
|
if (!ofs->config.redirect_follow)
|
|
d.last = i == poe->numlower - 1;
|
|
else
|
|
d.last = lower.layer->idx == roe->numlower;
|
|
|
|
err = ovl_lookup_layer(lower.dentry, &d, &this, false);
|
|
if (err)
|
|
goto out_put;
|
|
|
|
if (!this)
|
|
continue;
|
|
|
|
if ((uppermetacopy || d.metacopy) && !ofs->config.metacopy) {
|
|
dput(this);
|
|
err = -EPERM;
|
|
pr_warn_ratelimited("refusing to follow metacopy origin for (%pd2)\n", dentry);
|
|
goto out_put;
|
|
}
|
|
|
|
/*
|
|
* If no origin fh is stored in upper of a merge dir, store fh
|
|
* of lower dir and set upper parent "impure".
|
|
*/
|
|
if (upperdentry && !ctr && !ofs->noxattr && d.is_dir) {
|
|
err = ovl_fix_origin(ofs, dentry, this, upperdentry);
|
|
if (err) {
|
|
dput(this);
|
|
goto out_put;
|
|
}
|
|
}
|
|
|
|
/*
|
|
* When "verify_lower" feature is enabled, do not merge with a
|
|
* lower dir that does not match a stored origin xattr. In any
|
|
* case, only verified origin is used for index lookup.
|
|
*
|
|
* For non-dir dentry, if index=on, then ensure origin
|
|
* matches the dentry found using path based lookup,
|
|
* otherwise error out.
|
|
*/
|
|
if (upperdentry && !ctr &&
|
|
((d.is_dir && ovl_verify_lower(dentry->d_sb)) ||
|
|
(!d.is_dir && ofs->config.index && origin_path))) {
|
|
err = ovl_verify_origin(ofs, upperdentry, this, false);
|
|
if (err) {
|
|
dput(this);
|
|
if (d.is_dir)
|
|
break;
|
|
goto out_put;
|
|
}
|
|
origin = this;
|
|
}
|
|
|
|
if (d.metacopy && ctr) {
|
|
/*
|
|
* Do not store intermediate metacopy dentries in
|
|
* lower chain, except top most lower metacopy dentry.
|
|
* Continue the loop so that if there is an absolute
|
|
* redirect on this dentry, poe can be reset to roe.
|
|
*/
|
|
dput(this);
|
|
this = NULL;
|
|
} else {
|
|
stack[ctr].dentry = this;
|
|
stack[ctr].layer = lower.layer;
|
|
ctr++;
|
|
}
|
|
|
|
/*
|
|
* Following redirects can have security consequences: it's like
|
|
* a symlink into the lower layer without the permission checks.
|
|
* This is only a problem if the upper layer is untrusted (e.g
|
|
* comes from an USB drive). This can allow a non-readable file
|
|
* or directory to become readable.
|
|
*
|
|
* Only following redirects when redirects are enabled disables
|
|
* this attack vector when not necessary.
|
|
*/
|
|
err = -EPERM;
|
|
if (d.redirect && !ofs->config.redirect_follow) {
|
|
pr_warn_ratelimited("refusing to follow redirect for (%pd2)\n",
|
|
dentry);
|
|
goto out_put;
|
|
}
|
|
|
|
if (d.stop)
|
|
break;
|
|
|
|
if (d.redirect && d.redirect[0] == '/' && poe != roe) {
|
|
poe = roe;
|
|
/* Find the current layer on the root dentry */
|
|
i = lower.layer->idx - 1;
|
|
}
|
|
}
|
|
|
|
/*
|
|
* For regular non-metacopy upper dentries, there is no lower
|
|
* path based lookup, hence ctr will be zero. If a dentry is found
|
|
* using ORIGIN xattr on upper, install it in stack.
|
|
*
|
|
* For metacopy dentry, path based lookup will find lower dentries.
|
|
* Just make sure a corresponding data dentry has been found.
|
|
*/
|
|
if (d.metacopy || (uppermetacopy && !ctr)) {
|
|
err = -EIO;
|
|
goto out_put;
|
|
} else if (!d.is_dir && upperdentry && !ctr && origin_path) {
|
|
if (WARN_ON(stack != NULL)) {
|
|
err = -EIO;
|
|
goto out_put;
|
|
}
|
|
stack = origin_path;
|
|
ctr = 1;
|
|
origin = origin_path->dentry;
|
|
origin_path = NULL;
|
|
}
|
|
|
|
/*
|
|
* Always lookup index if there is no-upperdentry.
|
|
*
|
|
* For the case of upperdentry, we have set origin by now if it
|
|
* needed to be set. There are basically three cases.
|
|
*
|
|
* For directories, lookup index by lower inode and verify it matches
|
|
* upper inode. We only trust dir index if we verified that lower dir
|
|
* matches origin, otherwise dir index entries may be inconsistent
|
|
* and we ignore them.
|
|
*
|
|
* For regular upper, we already set origin if upper had ORIGIN
|
|
* xattr. There is no verification though as there is no path
|
|
* based dentry lookup in lower in this case.
|
|
*
|
|
* For metacopy upper, we set a verified origin already if index
|
|
* is enabled and if upper had an ORIGIN xattr.
|
|
*
|
|
*/
|
|
if (!upperdentry && ctr)
|
|
origin = stack[0].dentry;
|
|
|
|
if (origin && ovl_indexdir(dentry->d_sb) &&
|
|
(!d.is_dir || ovl_index_all(dentry->d_sb))) {
|
|
index = ovl_lookup_index(ofs, upperdentry, origin, true);
|
|
if (IS_ERR(index)) {
|
|
err = PTR_ERR(index);
|
|
index = NULL;
|
|
goto out_put;
|
|
}
|
|
}
|
|
|
|
oe = ovl_alloc_entry(ctr);
|
|
err = -ENOMEM;
|
|
if (!oe)
|
|
goto out_put;
|
|
|
|
memcpy(oe->lowerstack, stack, sizeof(struct ovl_path) * ctr);
|
|
dentry->d_fsdata = oe;
|
|
|
|
if (upperopaque)
|
|
ovl_dentry_set_opaque(dentry);
|
|
|
|
if (upperdentry)
|
|
ovl_dentry_set_upper_alias(dentry);
|
|
else if (index) {
|
|
upperdentry = dget(index);
|
|
upperredirect = ovl_get_redirect_xattr(ofs, upperdentry, 0);
|
|
if (IS_ERR(upperredirect)) {
|
|
err = PTR_ERR(upperredirect);
|
|
upperredirect = NULL;
|
|
goto out_free_oe;
|
|
}
|
|
err = ovl_check_metacopy_xattr(ofs, upperdentry);
|
|
if (err < 0)
|
|
goto out_free_oe;
|
|
uppermetacopy = err;
|
|
}
|
|
|
|
if (upperdentry || ctr) {
|
|
struct ovl_inode_params oip = {
|
|
.upperdentry = upperdentry,
|
|
.lowerpath = stack,
|
|
.index = index,
|
|
.numlower = ctr,
|
|
.redirect = upperredirect,
|
|
.lowerdata = (ctr > 1 && !d.is_dir) ?
|
|
stack[ctr - 1].dentry : NULL,
|
|
};
|
|
|
|
inode = ovl_get_inode(dentry->d_sb, &oip);
|
|
err = PTR_ERR(inode);
|
|
if (IS_ERR(inode))
|
|
goto out_free_oe;
|
|
if (upperdentry && !uppermetacopy)
|
|
ovl_set_flag(OVL_UPPERDATA, inode);
|
|
}
|
|
|
|
ovl_dentry_init_reval(dentry, upperdentry);
|
|
|
|
ovl_revert_creds(dentry->d_sb, old_cred);
|
|
if (origin_path) {
|
|
dput(origin_path->dentry);
|
|
kfree(origin_path);
|
|
}
|
|
dput(index);
|
|
kfree(stack);
|
|
kfree(d.redirect);
|
|
return d_splice_alias(inode, dentry);
|
|
|
|
out_free_oe:
|
|
dentry->d_fsdata = NULL;
|
|
kfree(oe);
|
|
out_put:
|
|
dput(index);
|
|
for (i = 0; i < ctr; i++)
|
|
dput(stack[i].dentry);
|
|
kfree(stack);
|
|
out_put_upper:
|
|
if (origin_path) {
|
|
dput(origin_path->dentry);
|
|
kfree(origin_path);
|
|
}
|
|
dput(upperdentry);
|
|
kfree(upperredirect);
|
|
out:
|
|
kfree(d.redirect);
|
|
ovl_revert_creds(dentry->d_sb, old_cred);
|
|
return ERR_PTR(err);
|
|
}
|
|
|
|
bool ovl_lower_positive(struct dentry *dentry)
|
|
{
|
|
struct ovl_entry *poe = dentry->d_parent->d_fsdata;
|
|
const struct qstr *name = &dentry->d_name;
|
|
const struct cred *old_cred;
|
|
unsigned int i;
|
|
bool positive = false;
|
|
bool done = false;
|
|
|
|
/*
|
|
* If dentry is negative, then lower is positive iff this is a
|
|
* whiteout.
|
|
*/
|
|
if (!dentry->d_inode)
|
|
return ovl_dentry_is_opaque(dentry);
|
|
|
|
/* Negative upper -> positive lower */
|
|
if (!ovl_dentry_upper(dentry))
|
|
return true;
|
|
|
|
old_cred = ovl_override_creds(dentry->d_sb);
|
|
/* Positive upper -> have to look up lower to see whether it exists */
|
|
for (i = 0; !done && !positive && i < poe->numlower; i++) {
|
|
struct dentry *this;
|
|
struct dentry *lowerdir = poe->lowerstack[i].dentry;
|
|
|
|
this = lookup_positive_unlocked(name->name, lowerdir,
|
|
name->len);
|
|
if (IS_ERR(this)) {
|
|
switch (PTR_ERR(this)) {
|
|
case -ENOENT:
|
|
case -ENAMETOOLONG:
|
|
break;
|
|
|
|
default:
|
|
/*
|
|
* Assume something is there, we just couldn't
|
|
* access it.
|
|
*/
|
|
positive = true;
|
|
break;
|
|
}
|
|
} else {
|
|
positive = !ovl_is_whiteout(this);
|
|
done = true;
|
|
dput(this);
|
|
}
|
|
}
|
|
ovl_revert_creds(dentry->d_sb, old_cred);
|
|
|
|
return positive;
|
|
}
|