477f5e6b9e
-----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>
991 lines
23 KiB
C
991 lines
23 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/mount.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/cred.h>
|
|
#include <linux/xattr.h>
|
|
#include <linux/exportfs.h>
|
|
#include <linux/uuid.h>
|
|
#include <linux/namei.h>
|
|
#include <linux/ratelimit.h>
|
|
#include "overlayfs.h"
|
|
|
|
int ovl_want_write(struct dentry *dentry)
|
|
{
|
|
struct ovl_fs *ofs = dentry->d_sb->s_fs_info;
|
|
return mnt_want_write(ovl_upper_mnt(ofs));
|
|
}
|
|
|
|
void ovl_drop_write(struct dentry *dentry)
|
|
{
|
|
struct ovl_fs *ofs = dentry->d_sb->s_fs_info;
|
|
mnt_drop_write(ovl_upper_mnt(ofs));
|
|
}
|
|
|
|
struct dentry *ovl_workdir(struct dentry *dentry)
|
|
{
|
|
struct ovl_fs *ofs = dentry->d_sb->s_fs_info;
|
|
return ofs->workdir;
|
|
}
|
|
|
|
const struct cred *ovl_override_creds(struct super_block *sb)
|
|
{
|
|
struct ovl_fs *ofs = sb->s_fs_info;
|
|
|
|
if (!ofs->config.override_creds)
|
|
return NULL;
|
|
return override_creds(ofs->creator_cred);
|
|
}
|
|
|
|
void ovl_revert_creds(struct super_block *sb, const struct cred *old_cred)
|
|
{
|
|
if (old_cred)
|
|
revert_creds(old_cred);
|
|
}
|
|
|
|
/*
|
|
* Check if underlying fs supports file handles and try to determine encoding
|
|
* type, in order to deduce maximum inode number used by fs.
|
|
*
|
|
* Return 0 if file handles are not supported.
|
|
* Return 1 (FILEID_INO32_GEN) if fs uses the default 32bit inode encoding.
|
|
* Return -1 if fs uses a non default encoding with unknown inode size.
|
|
*/
|
|
int ovl_can_decode_fh(struct super_block *sb)
|
|
{
|
|
if (!sb->s_export_op || !sb->s_export_op->fh_to_dentry)
|
|
return 0;
|
|
|
|
return sb->s_export_op->encode_fh ? -1 : FILEID_INO32_GEN;
|
|
}
|
|
|
|
struct dentry *ovl_indexdir(struct super_block *sb)
|
|
{
|
|
struct ovl_fs *ofs = sb->s_fs_info;
|
|
|
|
return ofs->indexdir;
|
|
}
|
|
|
|
/* Index all files on copy up. For now only enabled for NFS export */
|
|
bool ovl_index_all(struct super_block *sb)
|
|
{
|
|
struct ovl_fs *ofs = sb->s_fs_info;
|
|
|
|
return ofs->config.nfs_export && ofs->config.index;
|
|
}
|
|
|
|
/* Verify lower origin on lookup. For now only enabled for NFS export */
|
|
bool ovl_verify_lower(struct super_block *sb)
|
|
{
|
|
struct ovl_fs *ofs = sb->s_fs_info;
|
|
|
|
return ofs->config.nfs_export && ofs->config.index;
|
|
}
|
|
|
|
struct ovl_entry *ovl_alloc_entry(unsigned int numlower)
|
|
{
|
|
size_t size = offsetof(struct ovl_entry, lowerstack[numlower]);
|
|
struct ovl_entry *oe = kzalloc(size, GFP_KERNEL);
|
|
|
|
if (oe)
|
|
oe->numlower = numlower;
|
|
|
|
return oe;
|
|
}
|
|
|
|
#define OVL_D_REVALIDATE (DCACHE_OP_REVALIDATE | DCACHE_OP_WEAK_REVALIDATE)
|
|
|
|
bool ovl_dentry_remote(struct dentry *dentry)
|
|
{
|
|
return dentry->d_flags & OVL_D_REVALIDATE;
|
|
}
|
|
|
|
void ovl_dentry_update_reval(struct dentry *dentry, struct dentry *realdentry)
|
|
{
|
|
if (!ovl_dentry_remote(realdentry))
|
|
return;
|
|
|
|
spin_lock(&dentry->d_lock);
|
|
dentry->d_flags |= realdentry->d_flags & OVL_D_REVALIDATE;
|
|
spin_unlock(&dentry->d_lock);
|
|
}
|
|
|
|
void ovl_dentry_init_reval(struct dentry *dentry, struct dentry *upperdentry)
|
|
{
|
|
return ovl_dentry_init_flags(dentry, upperdentry, OVL_D_REVALIDATE);
|
|
}
|
|
|
|
void ovl_dentry_init_flags(struct dentry *dentry, struct dentry *upperdentry,
|
|
unsigned int mask)
|
|
{
|
|
struct ovl_entry *oe = OVL_E(dentry);
|
|
unsigned int i, flags = 0;
|
|
|
|
if (upperdentry)
|
|
flags |= upperdentry->d_flags;
|
|
for (i = 0; i < oe->numlower; i++)
|
|
flags |= oe->lowerstack[i].dentry->d_flags;
|
|
|
|
spin_lock(&dentry->d_lock);
|
|
dentry->d_flags &= ~mask;
|
|
dentry->d_flags |= flags & mask;
|
|
spin_unlock(&dentry->d_lock);
|
|
}
|
|
|
|
bool ovl_dentry_weird(struct dentry *dentry)
|
|
{
|
|
return dentry->d_flags & (DCACHE_NEED_AUTOMOUNT |
|
|
DCACHE_MANAGE_TRANSIT |
|
|
DCACHE_OP_HASH |
|
|
DCACHE_OP_COMPARE);
|
|
}
|
|
|
|
enum ovl_path_type ovl_path_type(struct dentry *dentry)
|
|
{
|
|
struct ovl_entry *oe = dentry->d_fsdata;
|
|
enum ovl_path_type type = 0;
|
|
|
|
if (ovl_dentry_upper(dentry)) {
|
|
type = __OVL_PATH_UPPER;
|
|
|
|
/*
|
|
* Non-dir dentry can hold lower dentry of its copy up origin.
|
|
*/
|
|
if (oe->numlower) {
|
|
if (ovl_test_flag(OVL_CONST_INO, d_inode(dentry)))
|
|
type |= __OVL_PATH_ORIGIN;
|
|
if (d_is_dir(dentry) ||
|
|
!ovl_has_upperdata(d_inode(dentry)))
|
|
type |= __OVL_PATH_MERGE;
|
|
}
|
|
} else {
|
|
if (oe->numlower > 1)
|
|
type |= __OVL_PATH_MERGE;
|
|
}
|
|
return type;
|
|
}
|
|
|
|
void ovl_path_upper(struct dentry *dentry, struct path *path)
|
|
{
|
|
struct ovl_fs *ofs = dentry->d_sb->s_fs_info;
|
|
|
|
path->mnt = ovl_upper_mnt(ofs);
|
|
path->dentry = ovl_dentry_upper(dentry);
|
|
}
|
|
|
|
void ovl_path_lower(struct dentry *dentry, struct path *path)
|
|
{
|
|
struct ovl_entry *oe = dentry->d_fsdata;
|
|
|
|
if (oe->numlower) {
|
|
path->mnt = oe->lowerstack[0].layer->mnt;
|
|
path->dentry = oe->lowerstack[0].dentry;
|
|
} else {
|
|
*path = (struct path) { };
|
|
}
|
|
}
|
|
|
|
void ovl_path_lowerdata(struct dentry *dentry, struct path *path)
|
|
{
|
|
struct ovl_entry *oe = dentry->d_fsdata;
|
|
|
|
if (oe->numlower) {
|
|
path->mnt = oe->lowerstack[oe->numlower - 1].layer->mnt;
|
|
path->dentry = oe->lowerstack[oe->numlower - 1].dentry;
|
|
} else {
|
|
*path = (struct path) { };
|
|
}
|
|
}
|
|
|
|
enum ovl_path_type ovl_path_real(struct dentry *dentry, struct path *path)
|
|
{
|
|
enum ovl_path_type type = ovl_path_type(dentry);
|
|
|
|
if (!OVL_TYPE_UPPER(type))
|
|
ovl_path_lower(dentry, path);
|
|
else
|
|
ovl_path_upper(dentry, path);
|
|
|
|
return type;
|
|
}
|
|
|
|
struct dentry *ovl_dentry_upper(struct dentry *dentry)
|
|
{
|
|
return ovl_upperdentry_dereference(OVL_I(d_inode(dentry)));
|
|
}
|
|
|
|
struct dentry *ovl_dentry_lower(struct dentry *dentry)
|
|
{
|
|
struct ovl_entry *oe = dentry->d_fsdata;
|
|
|
|
return oe->numlower ? oe->lowerstack[0].dentry : NULL;
|
|
}
|
|
|
|
const struct ovl_layer *ovl_layer_lower(struct dentry *dentry)
|
|
{
|
|
struct ovl_entry *oe = dentry->d_fsdata;
|
|
|
|
return oe->numlower ? oe->lowerstack[0].layer : NULL;
|
|
}
|
|
|
|
/*
|
|
* ovl_dentry_lower() could return either a data dentry or metacopy dentry
|
|
* dependig on what is stored in lowerstack[0]. At times we need to find
|
|
* lower dentry which has data (and not metacopy dentry). This helper
|
|
* returns the lower data dentry.
|
|
*/
|
|
struct dentry *ovl_dentry_lowerdata(struct dentry *dentry)
|
|
{
|
|
struct ovl_entry *oe = dentry->d_fsdata;
|
|
|
|
return oe->numlower ? oe->lowerstack[oe->numlower - 1].dentry : NULL;
|
|
}
|
|
|
|
struct dentry *ovl_dentry_real(struct dentry *dentry)
|
|
{
|
|
return ovl_dentry_upper(dentry) ?: ovl_dentry_lower(dentry);
|
|
}
|
|
|
|
struct dentry *ovl_i_dentry_upper(struct inode *inode)
|
|
{
|
|
return ovl_upperdentry_dereference(OVL_I(inode));
|
|
}
|
|
|
|
struct inode *ovl_inode_upper(struct inode *inode)
|
|
{
|
|
struct dentry *upperdentry = ovl_i_dentry_upper(inode);
|
|
|
|
return upperdentry ? d_inode(upperdentry) : NULL;
|
|
}
|
|
|
|
struct inode *ovl_inode_lower(struct inode *inode)
|
|
{
|
|
return OVL_I(inode)->lower;
|
|
}
|
|
|
|
struct inode *ovl_inode_real(struct inode *inode)
|
|
{
|
|
return ovl_inode_upper(inode) ?: ovl_inode_lower(inode);
|
|
}
|
|
|
|
/* Return inode which contains lower data. Do not return metacopy */
|
|
struct inode *ovl_inode_lowerdata(struct inode *inode)
|
|
{
|
|
if (WARN_ON(!S_ISREG(inode->i_mode)))
|
|
return NULL;
|
|
|
|
return OVL_I(inode)->lowerdata ?: ovl_inode_lower(inode);
|
|
}
|
|
|
|
/* Return real inode which contains data. Does not return metacopy inode */
|
|
struct inode *ovl_inode_realdata(struct inode *inode)
|
|
{
|
|
struct inode *upperinode;
|
|
|
|
upperinode = ovl_inode_upper(inode);
|
|
if (upperinode && ovl_has_upperdata(inode))
|
|
return upperinode;
|
|
|
|
return ovl_inode_lowerdata(inode);
|
|
}
|
|
|
|
struct ovl_dir_cache *ovl_dir_cache(struct inode *inode)
|
|
{
|
|
return OVL_I(inode)->cache;
|
|
}
|
|
|
|
void ovl_set_dir_cache(struct inode *inode, struct ovl_dir_cache *cache)
|
|
{
|
|
OVL_I(inode)->cache = cache;
|
|
}
|
|
|
|
void ovl_dentry_set_flag(unsigned long flag, struct dentry *dentry)
|
|
{
|
|
set_bit(flag, &OVL_E(dentry)->flags);
|
|
}
|
|
|
|
void ovl_dentry_clear_flag(unsigned long flag, struct dentry *dentry)
|
|
{
|
|
clear_bit(flag, &OVL_E(dentry)->flags);
|
|
}
|
|
|
|
bool ovl_dentry_test_flag(unsigned long flag, struct dentry *dentry)
|
|
{
|
|
return test_bit(flag, &OVL_E(dentry)->flags);
|
|
}
|
|
|
|
bool ovl_dentry_is_opaque(struct dentry *dentry)
|
|
{
|
|
return ovl_dentry_test_flag(OVL_E_OPAQUE, dentry);
|
|
}
|
|
|
|
bool ovl_dentry_is_whiteout(struct dentry *dentry)
|
|
{
|
|
return !dentry->d_inode && ovl_dentry_is_opaque(dentry);
|
|
}
|
|
|
|
void ovl_dentry_set_opaque(struct dentry *dentry)
|
|
{
|
|
ovl_dentry_set_flag(OVL_E_OPAQUE, dentry);
|
|
}
|
|
|
|
/*
|
|
* For hard links and decoded file handles, it's possible for ovl_dentry_upper()
|
|
* to return positive, while there's no actual upper alias for the inode.
|
|
* Copy up code needs to know about the existence of the upper alias, so it
|
|
* can't use ovl_dentry_upper().
|
|
*/
|
|
bool ovl_dentry_has_upper_alias(struct dentry *dentry)
|
|
{
|
|
return ovl_dentry_test_flag(OVL_E_UPPER_ALIAS, dentry);
|
|
}
|
|
|
|
void ovl_dentry_set_upper_alias(struct dentry *dentry)
|
|
{
|
|
ovl_dentry_set_flag(OVL_E_UPPER_ALIAS, dentry);
|
|
}
|
|
|
|
static bool ovl_should_check_upperdata(struct inode *inode)
|
|
{
|
|
if (!S_ISREG(inode->i_mode))
|
|
return false;
|
|
|
|
if (!ovl_inode_lower(inode))
|
|
return false;
|
|
|
|
return true;
|
|
}
|
|
|
|
bool ovl_has_upperdata(struct inode *inode)
|
|
{
|
|
if (!ovl_should_check_upperdata(inode))
|
|
return true;
|
|
|
|
if (!ovl_test_flag(OVL_UPPERDATA, inode))
|
|
return false;
|
|
/*
|
|
* Pairs with smp_wmb() in ovl_set_upperdata(). Main user of
|
|
* ovl_has_upperdata() is ovl_copy_up_meta_inode_data(). Make sure
|
|
* if setting of OVL_UPPERDATA is visible, then effects of writes
|
|
* before that are visible too.
|
|
*/
|
|
smp_rmb();
|
|
return true;
|
|
}
|
|
|
|
void ovl_set_upperdata(struct inode *inode)
|
|
{
|
|
/*
|
|
* Pairs with smp_rmb() in ovl_has_upperdata(). Make sure
|
|
* if OVL_UPPERDATA flag is visible, then effects of write operations
|
|
* before it are visible as well.
|
|
*/
|
|
smp_wmb();
|
|
ovl_set_flag(OVL_UPPERDATA, inode);
|
|
}
|
|
|
|
/* Caller should hold ovl_inode->lock */
|
|
bool ovl_dentry_needs_data_copy_up_locked(struct dentry *dentry, int flags)
|
|
{
|
|
if (!ovl_open_flags_need_copy_up(flags))
|
|
return false;
|
|
|
|
return !ovl_test_flag(OVL_UPPERDATA, d_inode(dentry));
|
|
}
|
|
|
|
bool ovl_dentry_needs_data_copy_up(struct dentry *dentry, int flags)
|
|
{
|
|
if (!ovl_open_flags_need_copy_up(flags))
|
|
return false;
|
|
|
|
return !ovl_has_upperdata(d_inode(dentry));
|
|
}
|
|
|
|
bool ovl_redirect_dir(struct super_block *sb)
|
|
{
|
|
struct ovl_fs *ofs = sb->s_fs_info;
|
|
|
|
return ofs->config.redirect_dir && !ofs->noxattr;
|
|
}
|
|
|
|
const char *ovl_dentry_get_redirect(struct dentry *dentry)
|
|
{
|
|
return OVL_I(d_inode(dentry))->redirect;
|
|
}
|
|
|
|
void ovl_dentry_set_redirect(struct dentry *dentry, const char *redirect)
|
|
{
|
|
struct ovl_inode *oi = OVL_I(d_inode(dentry));
|
|
|
|
kfree(oi->redirect);
|
|
oi->redirect = redirect;
|
|
}
|
|
|
|
void ovl_inode_update(struct inode *inode, struct dentry *upperdentry)
|
|
{
|
|
struct inode *upperinode = d_inode(upperdentry);
|
|
|
|
WARN_ON(OVL_I(inode)->__upperdentry);
|
|
|
|
/*
|
|
* Make sure upperdentry is consistent before making it visible
|
|
*/
|
|
smp_wmb();
|
|
OVL_I(inode)->__upperdentry = upperdentry;
|
|
if (inode_unhashed(inode)) {
|
|
inode->i_private = upperinode;
|
|
__insert_inode_hash(inode, (unsigned long) upperinode);
|
|
}
|
|
}
|
|
|
|
static void ovl_dir_version_inc(struct dentry *dentry, bool impurity)
|
|
{
|
|
struct inode *inode = d_inode(dentry);
|
|
|
|
WARN_ON(!inode_is_locked(inode));
|
|
WARN_ON(!d_is_dir(dentry));
|
|
/*
|
|
* Version is used by readdir code to keep cache consistent.
|
|
* For merge dirs (or dirs with origin) all changes need to be noted.
|
|
* For non-merge dirs, cache contains only impure entries (i.e. ones
|
|
* which have been copied up and have origins), so only need to note
|
|
* changes to impure entries.
|
|
*/
|
|
if (!ovl_dir_is_real(dentry) || impurity)
|
|
OVL_I(inode)->version++;
|
|
}
|
|
|
|
void ovl_dir_modified(struct dentry *dentry, bool impurity)
|
|
{
|
|
/* Copy mtime/ctime */
|
|
ovl_copyattr(d_inode(ovl_dentry_upper(dentry)), d_inode(dentry));
|
|
|
|
ovl_dir_version_inc(dentry, impurity);
|
|
}
|
|
|
|
u64 ovl_dentry_version_get(struct dentry *dentry)
|
|
{
|
|
struct inode *inode = d_inode(dentry);
|
|
|
|
WARN_ON(!inode_is_locked(inode));
|
|
return OVL_I(inode)->version;
|
|
}
|
|
|
|
bool ovl_is_whiteout(struct dentry *dentry)
|
|
{
|
|
struct inode *inode = dentry->d_inode;
|
|
|
|
return inode && IS_WHITEOUT(inode);
|
|
}
|
|
|
|
struct file *ovl_path_open(struct path *path, int flags)
|
|
{
|
|
struct inode *inode = d_inode(path->dentry);
|
|
int err, acc_mode;
|
|
|
|
if (flags & ~(O_ACCMODE | O_LARGEFILE))
|
|
BUG();
|
|
|
|
switch (flags & O_ACCMODE) {
|
|
case O_RDONLY:
|
|
acc_mode = MAY_READ;
|
|
break;
|
|
case O_WRONLY:
|
|
acc_mode = MAY_WRITE;
|
|
break;
|
|
default:
|
|
BUG();
|
|
}
|
|
|
|
err = inode_permission(inode, acc_mode | MAY_OPEN);
|
|
if (err)
|
|
return ERR_PTR(err);
|
|
|
|
/* O_NOATIME is an optimization, don't fail if not permitted */
|
|
if (inode_owner_or_capable(inode))
|
|
flags |= O_NOATIME;
|
|
|
|
return dentry_open(path, flags, current_cred());
|
|
}
|
|
|
|
/* Caller should hold ovl_inode->lock */
|
|
static bool ovl_already_copied_up_locked(struct dentry *dentry, int flags)
|
|
{
|
|
bool disconnected = dentry->d_flags & DCACHE_DISCONNECTED;
|
|
|
|
if (ovl_dentry_upper(dentry) &&
|
|
(ovl_dentry_has_upper_alias(dentry) || disconnected) &&
|
|
!ovl_dentry_needs_data_copy_up_locked(dentry, flags))
|
|
return true;
|
|
|
|
return false;
|
|
}
|
|
|
|
bool ovl_already_copied_up(struct dentry *dentry, int flags)
|
|
{
|
|
bool disconnected = dentry->d_flags & DCACHE_DISCONNECTED;
|
|
|
|
/*
|
|
* Check if copy-up has happened as well as for upper alias (in
|
|
* case of hard links) is there.
|
|
*
|
|
* Both checks are lockless:
|
|
* - false negatives: will recheck under oi->lock
|
|
* - false positives:
|
|
* + ovl_dentry_upper() uses memory barriers to ensure the
|
|
* upper dentry is up-to-date
|
|
* + ovl_dentry_has_upper_alias() relies on locking of
|
|
* upper parent i_rwsem to prevent reordering copy-up
|
|
* with rename.
|
|
*/
|
|
if (ovl_dentry_upper(dentry) &&
|
|
(ovl_dentry_has_upper_alias(dentry) || disconnected) &&
|
|
!ovl_dentry_needs_data_copy_up(dentry, flags))
|
|
return true;
|
|
|
|
return false;
|
|
}
|
|
|
|
int ovl_copy_up_start(struct dentry *dentry, int flags)
|
|
{
|
|
struct inode *inode = d_inode(dentry);
|
|
int err;
|
|
|
|
err = ovl_inode_lock_interruptible(inode);
|
|
if (!err && ovl_already_copied_up_locked(dentry, flags)) {
|
|
err = 1; /* Already copied up */
|
|
ovl_inode_unlock(inode);
|
|
}
|
|
|
|
return err;
|
|
}
|
|
|
|
void ovl_copy_up_end(struct dentry *dentry)
|
|
{
|
|
ovl_inode_unlock(d_inode(dentry));
|
|
}
|
|
|
|
bool ovl_check_origin_xattr(struct ovl_fs *ofs, struct dentry *dentry)
|
|
{
|
|
ssize_t res;
|
|
|
|
res = ovl_do_getxattr(ofs, dentry, OVL_XATTR_ORIGIN, NULL, 0);
|
|
|
|
/* Zero size value means "copied up but origin unknown" */
|
|
if (res >= 0)
|
|
return true;
|
|
|
|
return false;
|
|
}
|
|
|
|
bool ovl_check_dir_xattr(struct super_block *sb, struct dentry *dentry,
|
|
enum ovl_xattr ox)
|
|
{
|
|
ssize_t res;
|
|
char val;
|
|
|
|
if (!d_is_dir(dentry))
|
|
return false;
|
|
|
|
res = ovl_do_getxattr(OVL_FS(sb), dentry, ox, &val, 1);
|
|
if (res == 1 && val == 'y')
|
|
return true;
|
|
|
|
return false;
|
|
}
|
|
|
|
#define OVL_XATTR_OPAQUE_POSTFIX "opaque"
|
|
#define OVL_XATTR_REDIRECT_POSTFIX "redirect"
|
|
#define OVL_XATTR_ORIGIN_POSTFIX "origin"
|
|
#define OVL_XATTR_IMPURE_POSTFIX "impure"
|
|
#define OVL_XATTR_NLINK_POSTFIX "nlink"
|
|
#define OVL_XATTR_UPPER_POSTFIX "upper"
|
|
#define OVL_XATTR_METACOPY_POSTFIX "metacopy"
|
|
|
|
#define OVL_XATTR_TAB_ENTRY(x) \
|
|
[x] = OVL_XATTR_PREFIX x ## _POSTFIX
|
|
|
|
const char *ovl_xattr_table[] = {
|
|
OVL_XATTR_TAB_ENTRY(OVL_XATTR_OPAQUE),
|
|
OVL_XATTR_TAB_ENTRY(OVL_XATTR_REDIRECT),
|
|
OVL_XATTR_TAB_ENTRY(OVL_XATTR_ORIGIN),
|
|
OVL_XATTR_TAB_ENTRY(OVL_XATTR_IMPURE),
|
|
OVL_XATTR_TAB_ENTRY(OVL_XATTR_NLINK),
|
|
OVL_XATTR_TAB_ENTRY(OVL_XATTR_UPPER),
|
|
OVL_XATTR_TAB_ENTRY(OVL_XATTR_METACOPY),
|
|
};
|
|
|
|
int ovl_check_setxattr(struct dentry *dentry, struct dentry *upperdentry,
|
|
enum ovl_xattr ox, const void *value, size_t size,
|
|
int xerr)
|
|
{
|
|
int err;
|
|
struct ovl_fs *ofs = dentry->d_sb->s_fs_info;
|
|
|
|
if (ofs->noxattr)
|
|
return xerr;
|
|
|
|
err = ovl_do_setxattr(ofs, upperdentry, ox, value, size);
|
|
|
|
if (err == -EOPNOTSUPP) {
|
|
pr_warn("cannot set %s xattr on upper\n", ovl_xattr(ofs, ox));
|
|
ofs->noxattr = true;
|
|
return xerr;
|
|
}
|
|
|
|
return err;
|
|
}
|
|
|
|
int ovl_set_impure(struct dentry *dentry, struct dentry *upperdentry)
|
|
{
|
|
int err;
|
|
|
|
if (ovl_test_flag(OVL_IMPURE, d_inode(dentry)))
|
|
return 0;
|
|
|
|
/*
|
|
* Do not fail when upper doesn't support xattrs.
|
|
* Upper inodes won't have origin nor redirect xattr anyway.
|
|
*/
|
|
err = ovl_check_setxattr(dentry, upperdentry, OVL_XATTR_IMPURE,
|
|
"y", 1, 0);
|
|
if (!err)
|
|
ovl_set_flag(OVL_IMPURE, d_inode(dentry));
|
|
|
|
return err;
|
|
}
|
|
|
|
/**
|
|
* Caller must hold a reference to inode to prevent it from being freed while
|
|
* it is marked inuse.
|
|
*/
|
|
bool ovl_inuse_trylock(struct dentry *dentry)
|
|
{
|
|
struct inode *inode = d_inode(dentry);
|
|
bool locked = false;
|
|
|
|
spin_lock(&inode->i_lock);
|
|
if (!(inode->i_state & I_OVL_INUSE)) {
|
|
inode->i_state |= I_OVL_INUSE;
|
|
locked = true;
|
|
}
|
|
spin_unlock(&inode->i_lock);
|
|
|
|
return locked;
|
|
}
|
|
|
|
void ovl_inuse_unlock(struct dentry *dentry)
|
|
{
|
|
if (dentry) {
|
|
struct inode *inode = d_inode(dentry);
|
|
|
|
spin_lock(&inode->i_lock);
|
|
WARN_ON(!(inode->i_state & I_OVL_INUSE));
|
|
inode->i_state &= ~I_OVL_INUSE;
|
|
spin_unlock(&inode->i_lock);
|
|
}
|
|
}
|
|
|
|
bool ovl_is_inuse(struct dentry *dentry)
|
|
{
|
|
struct inode *inode = d_inode(dentry);
|
|
bool inuse;
|
|
|
|
spin_lock(&inode->i_lock);
|
|
inuse = (inode->i_state & I_OVL_INUSE);
|
|
spin_unlock(&inode->i_lock);
|
|
|
|
return inuse;
|
|
}
|
|
|
|
/*
|
|
* Does this overlay dentry need to be indexed on copy up?
|
|
*/
|
|
bool ovl_need_index(struct dentry *dentry)
|
|
{
|
|
struct dentry *lower = ovl_dentry_lower(dentry);
|
|
|
|
if (!lower || !ovl_indexdir(dentry->d_sb))
|
|
return false;
|
|
|
|
/* Index all files for NFS export and consistency verification */
|
|
if (ovl_index_all(dentry->d_sb))
|
|
return true;
|
|
|
|
/* Index only lower hardlinks on copy up */
|
|
if (!d_is_dir(lower) && d_inode(lower)->i_nlink > 1)
|
|
return true;
|
|
|
|
return false;
|
|
}
|
|
|
|
/* Caller must hold OVL_I(inode)->lock */
|
|
static void ovl_cleanup_index(struct dentry *dentry)
|
|
{
|
|
struct dentry *indexdir = ovl_indexdir(dentry->d_sb);
|
|
struct inode *dir = indexdir->d_inode;
|
|
struct dentry *lowerdentry = ovl_dentry_lower(dentry);
|
|
struct dentry *upperdentry = ovl_dentry_upper(dentry);
|
|
struct dentry *index = NULL;
|
|
struct inode *inode;
|
|
struct qstr name = { };
|
|
int err;
|
|
|
|
err = ovl_get_index_name(lowerdentry, &name);
|
|
if (err)
|
|
goto fail;
|
|
|
|
inode = d_inode(upperdentry);
|
|
if (!S_ISDIR(inode->i_mode) && inode->i_nlink != 1) {
|
|
pr_warn_ratelimited("cleanup linked index (%pd2, ino=%lu, nlink=%u)\n",
|
|
upperdentry, inode->i_ino, inode->i_nlink);
|
|
/*
|
|
* We either have a bug with persistent union nlink or a lower
|
|
* hardlink was added while overlay is mounted. Adding a lower
|
|
* hardlink and then unlinking all overlay hardlinks would drop
|
|
* overlay nlink to zero before all upper inodes are unlinked.
|
|
* As a safety measure, when that situation is detected, set
|
|
* the overlay nlink to the index inode nlink minus one for the
|
|
* index entry itself.
|
|
*/
|
|
set_nlink(d_inode(dentry), inode->i_nlink - 1);
|
|
ovl_set_nlink_upper(dentry);
|
|
goto out;
|
|
}
|
|
|
|
inode_lock_nested(dir, I_MUTEX_PARENT);
|
|
index = lookup_one_len(name.name, indexdir, name.len);
|
|
err = PTR_ERR(index);
|
|
if (IS_ERR(index)) {
|
|
index = NULL;
|
|
} else if (ovl_index_all(dentry->d_sb)) {
|
|
/* Whiteout orphan index to block future open by handle */
|
|
err = ovl_cleanup_and_whiteout(OVL_FS(dentry->d_sb),
|
|
dir, index);
|
|
} else {
|
|
/* Cleanup orphan index entries */
|
|
err = ovl_cleanup(dir, index);
|
|
}
|
|
|
|
inode_unlock(dir);
|
|
if (err)
|
|
goto fail;
|
|
|
|
out:
|
|
kfree(name.name);
|
|
dput(index);
|
|
return;
|
|
|
|
fail:
|
|
pr_err("cleanup index of '%pd2' failed (%i)\n", dentry, err);
|
|
goto out;
|
|
}
|
|
|
|
/*
|
|
* Operations that change overlay inode and upper inode nlink need to be
|
|
* synchronized with copy up for persistent nlink accounting.
|
|
*/
|
|
int ovl_nlink_start(struct dentry *dentry)
|
|
{
|
|
struct inode *inode = d_inode(dentry);
|
|
const struct cred *old_cred;
|
|
int err;
|
|
|
|
if (WARN_ON(!inode))
|
|
return -ENOENT;
|
|
|
|
/*
|
|
* With inodes index is enabled, we store the union overlay nlink
|
|
* in an xattr on the index inode. When whiting out an indexed lower,
|
|
* we need to decrement the overlay persistent nlink, but before the
|
|
* first copy up, we have no upper index inode to store the xattr.
|
|
*
|
|
* As a workaround, before whiteout/rename over an indexed lower,
|
|
* copy up to create the upper index. Creating the upper index will
|
|
* initialize the overlay nlink, so it could be dropped if unlink
|
|
* or rename succeeds.
|
|
*
|
|
* TODO: implement metadata only index copy up when called with
|
|
* ovl_copy_up_flags(dentry, O_PATH).
|
|
*/
|
|
if (ovl_need_index(dentry) && !ovl_dentry_has_upper_alias(dentry)) {
|
|
err = ovl_copy_up(dentry);
|
|
if (err)
|
|
return err;
|
|
}
|
|
|
|
err = ovl_inode_lock_interruptible(inode);
|
|
if (err)
|
|
return err;
|
|
|
|
if (d_is_dir(dentry) || !ovl_test_flag(OVL_INDEX, inode))
|
|
goto out;
|
|
|
|
old_cred = ovl_override_creds(dentry->d_sb);
|
|
/*
|
|
* The overlay inode nlink should be incremented/decremented IFF the
|
|
* upper operation succeeds, along with nlink change of upper inode.
|
|
* Therefore, before link/unlink/rename, we store the union nlink
|
|
* value relative to the upper inode nlink in an upper inode xattr.
|
|
*/
|
|
err = ovl_set_nlink_upper(dentry);
|
|
ovl_revert_creds(dentry->d_sb, old_cred);
|
|
|
|
out:
|
|
if (err)
|
|
ovl_inode_unlock(inode);
|
|
|
|
return err;
|
|
}
|
|
|
|
void ovl_nlink_end(struct dentry *dentry)
|
|
{
|
|
struct inode *inode = d_inode(dentry);
|
|
|
|
if (ovl_test_flag(OVL_INDEX, inode) && inode->i_nlink == 0) {
|
|
const struct cred *old_cred;
|
|
|
|
old_cred = ovl_override_creds(dentry->d_sb);
|
|
ovl_cleanup_index(dentry);
|
|
ovl_revert_creds(dentry->d_sb, old_cred);
|
|
}
|
|
|
|
ovl_inode_unlock(inode);
|
|
}
|
|
|
|
int ovl_lock_rename_workdir(struct dentry *workdir, struct dentry *upperdir)
|
|
{
|
|
/* Workdir should not be the same as upperdir */
|
|
if (workdir == upperdir)
|
|
goto err;
|
|
|
|
/* Workdir should not be subdir of upperdir and vice versa */
|
|
if (lock_rename(workdir, upperdir) != NULL)
|
|
goto err_unlock;
|
|
|
|
return 0;
|
|
|
|
err_unlock:
|
|
unlock_rename(workdir, upperdir);
|
|
err:
|
|
pr_err("failed to lock workdir+upperdir\n");
|
|
return -EIO;
|
|
}
|
|
|
|
/* err < 0, 0 if no metacopy xattr, 1 if metacopy xattr found */
|
|
int ovl_check_metacopy_xattr(struct ovl_fs *ofs, struct dentry *dentry)
|
|
{
|
|
ssize_t res;
|
|
|
|
/* Only regular files can have metacopy xattr */
|
|
if (!S_ISREG(d_inode(dentry)->i_mode))
|
|
return 0;
|
|
|
|
res = ovl_do_getxattr(ofs, dentry, OVL_XATTR_METACOPY, NULL, 0);
|
|
if (res < 0) {
|
|
if (res == -ENODATA || res == -EOPNOTSUPP)
|
|
return 0;
|
|
goto out;
|
|
}
|
|
|
|
return 1;
|
|
out:
|
|
pr_warn_ratelimited("failed to get metacopy (%zi)\n", res);
|
|
return res;
|
|
}
|
|
|
|
bool ovl_is_metacopy_dentry(struct dentry *dentry)
|
|
{
|
|
struct ovl_entry *oe = dentry->d_fsdata;
|
|
|
|
if (!d_is_reg(dentry))
|
|
return false;
|
|
|
|
if (ovl_dentry_upper(dentry)) {
|
|
if (!ovl_has_upperdata(d_inode(dentry)))
|
|
return true;
|
|
return false;
|
|
}
|
|
|
|
return (oe->numlower > 1);
|
|
}
|
|
|
|
char *ovl_get_redirect_xattr(struct ovl_fs *ofs, struct dentry *dentry,
|
|
int padding)
|
|
{
|
|
int res;
|
|
char *s, *next, *buf = NULL;
|
|
|
|
res = ovl_do_getxattr(ofs, dentry, OVL_XATTR_REDIRECT, NULL, 0);
|
|
if (res == -ENODATA || res == -EOPNOTSUPP)
|
|
return NULL;
|
|
if (res < 0)
|
|
goto fail;
|
|
if (res == 0)
|
|
goto invalid;
|
|
|
|
buf = kzalloc(res + padding + 1, GFP_KERNEL);
|
|
if (!buf)
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
res = ovl_do_getxattr(ofs, dentry, OVL_XATTR_REDIRECT, buf, res);
|
|
if (res < 0)
|
|
goto fail;
|
|
if (res == 0)
|
|
goto invalid;
|
|
|
|
if (buf[0] == '/') {
|
|
for (s = buf; *s++ == '/'; s = next) {
|
|
next = strchrnul(s, '/');
|
|
if (s == next)
|
|
goto invalid;
|
|
}
|
|
} else {
|
|
if (strchr(buf, '/') != NULL)
|
|
goto invalid;
|
|
}
|
|
|
|
return buf;
|
|
invalid:
|
|
pr_warn_ratelimited("invalid redirect (%s)\n", buf);
|
|
res = -EINVAL;
|
|
goto err_free;
|
|
fail:
|
|
pr_warn_ratelimited("failed to get redirect (%i)\n", res);
|
|
err_free:
|
|
kfree(buf);
|
|
return ERR_PTR(res);
|
|
}
|
|
|
|
/*
|
|
* ovl_sync_status() - Check fs sync status for volatile mounts
|
|
*
|
|
* Returns 1 if this is not a volatile mount and a real sync is required.
|
|
*
|
|
* Returns 0 if syncing can be skipped because mount is volatile, and no errors
|
|
* have occurred on the upperdir since the mount.
|
|
*
|
|
* Returns -errno if it is a volatile mount, and the error that occurred since
|
|
* the last mount. If the error code changes, it'll return the latest error
|
|
* code.
|
|
*/
|
|
|
|
int ovl_sync_status(struct ovl_fs *ofs)
|
|
{
|
|
struct vfsmount *mnt;
|
|
|
|
if (ovl_should_sync(ofs))
|
|
return 1;
|
|
|
|
mnt = ovl_upper_mnt(ofs);
|
|
if (!mnt)
|
|
return 0;
|
|
|
|
return errseq_check(&mnt->mnt_sb->s_wb_err, ofs->errseq);
|
|
}
|