87acfa0267
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAl5Cn6wACgkQONu9yGCS
aT789BAAkpzYCCHEL2aqDpnZQdu1kVua2nywEJCY0WqSM1lWLeU1Lk9EvS6uu99B
nHnIgoAGXR1zQy9rlhpKKt62LvCCM94QWlQRDYYeJxbFPn1ogT2/0vmwN7rqNz4M
Jdszd6gfNKtB3zpZZLJ0KXG8q6YRp5kXOHEzOXNjcVsfKRuNTWWIBV0dMmkCzduQ
Y5e62+d1FnnRFj28R7wjJfXiZSRnIGcMHohcQGXsWZsh2rktYOYsL6G37I9lCBwx
RO7/+qVOT+BImqB5fIxB98JOzOlo6uEVqPgXjMHAAZUzzA4KpOkDBn55m5hA9axf
EG67Ft4vZJc6Q3FTtHdSZZ/x6TBAJ2DUzatpKhCTDB3vlWJ6a+CsTFq3dXj4+bFr
hFuyi0u91VeudmWR8IH5Er8QaNaOq8m72XAwK22fZptZz0ZHl+Bf1QZyEY0L0P2Q
DpT/kmZVgSSDusvMtJOwI8Vr4Ibb8o46kFTQN+PCSs0pbPchEJmInHz0mIypK89N
4YIjcDZZu3WUS13pEsgNAi2FEpwZdn32LYxZg8xTYBtovzuvT1pJUEppiVSMXgKS
8vF6oCAd7pX9Fal5fYklA7gyQENnHBFI+LE+bHwMR/qwreH/3wBTLnhRPsGOxyZI
oj57YDdxZCAwEfXGoWA3Le+60lj6bGuRfmCc4VkodaOxMLb1WrE=
=rUtE
-----END PGP SIGNATURE-----
Merge 5.4.19 into android-5.4
Changes in 5.4.19
sparc32: fix struct ipc64_perm type definition
bnxt_en: Move devlink_register before registering netdev
cls_rsvp: fix rsvp_policy
gtp: use __GFP_NOWARN to avoid memalloc warning
l2tp: Allow duplicate session creation with UDP
net: hsr: fix possible NULL deref in hsr_handle_frame()
net_sched: fix an OOB access in cls_tcindex
net: stmmac: Delete txtimer in suspend()
bnxt_en: Fix TC queue mapping.
rxrpc: Fix use-after-free in rxrpc_put_local()
rxrpc: Fix insufficient receive notification generation
rxrpc: Fix missing active use pinning of rxrpc_local object
rxrpc: Fix NULL pointer deref due to call->conn being cleared on disconnect
tcp: clear tp->total_retrans in tcp_disconnect()
tcp: clear tp->delivered in tcp_disconnect()
tcp: clear tp->data_segs{in|out} in tcp_disconnect()
tcp: clear tp->segs_{in|out} in tcp_disconnect()
ionic: fix rxq comp packet type mask
MAINTAINERS: correct entries for ISDN/mISDN section
netdevsim: fix stack-out-of-bounds in nsim_dev_debugfs_init()
bnxt_en: Fix logic that disables Bus Master during firmware reset.
media: uvcvideo: Avoid cyclic entity chains due to malformed USB descriptors
mfd: dln2: More sanity checking for endpoints
netfilter: ipset: fix suspicious RCU usage in find_set_and_id
ipc/msg.c: consolidate all xxxctl_down() functions
tracing/kprobes: Have uname use __get_str() in print_fmt
tracing: Fix sched switch start/stop refcount racy updates
rcu: Use *_ONCE() to protect lockless ->expmask accesses
rcu: Avoid data-race in rcu_gp_fqs_check_wake()
srcu: Apply *_ONCE() to ->srcu_last_gp_end
rcu: Use READ_ONCE() for ->expmask in rcu_read_unlock_special()
nvmet: Fix error print message at nvmet_install_queue function
nvmet: Fix controller use after free
Bluetooth: btusb: fix memory leak on fw
Bluetooth: btusb: Disable runtime suspend on Realtek devices
brcmfmac: Fix memory leak in brcmf_usbdev_qinit
usb: dwc3: gadget: Check END_TRANSFER completion
usb: dwc3: gadget: Delay starting transfer
usb: typec: tcpci: mask event interrupts when remove driver
objtool: Silence build output
usb: gadget: f_fs: set req->num_sgs as 0 for non-sg transfer
usb: gadget: legacy: set max_speed to super-speed
usb: gadget: f_ncm: Use atomic_t to track in-flight request
usb: gadget: f_ecm: Use atomic_t to track in-flight request
ALSA: usb-audio: Fix endianess in descriptor validation
ALSA: usb-audio: Annotate endianess in Scarlett gen2 quirk
ALSA: dummy: Fix PCM format loop in proc output
memcg: fix a crash in wb_workfn when a device disappears
mm/sparse.c: reset section's mem_map when fully deactivated
mmc: sdhci-pci: Make function amd_sdhci_reset static
utimes: Clamp the timestamps in notify_change()
mm/memory_hotplug: fix remove_memory() lockdep splat
mm: thp: don't need care deferred split queue in memcg charge move path
mm: move_pages: report the number of non-attempted pages
media/v4l2-core: set pages dirty upon releasing DMA buffers
media: v4l2-core: compat: ignore native command codes
media: v4l2-rect.h: fix v4l2_rect_map_inside() top/left adjustments
lib/test_kasan.c: fix memory leak in kmalloc_oob_krealloc_more()
irqdomain: Fix a memory leak in irq_domain_push_irq()
x86/cpu: Update cached HLE state on write to TSX_CTRL_CPUID_CLEAR
platform/x86: intel_scu_ipc: Fix interrupt support
ALSA: hda: Apply aligned MMIO access only conditionally
ALSA: hda: Add Clevo W65_67SB the power_save blacklist
ALSA: hda: Add JasperLake PCI ID and codec vid
arm64: acpi: fix DAIF manipulation with pNMI
KVM: arm64: Correct PSTATE on exception entry
KVM: arm/arm64: Correct CPSR on exception entry
KVM: arm/arm64: Correct AArch32 SPSR on exception entry
KVM: arm64: Only sign-extend MMIO up to register width
MIPS: syscalls: fix indentation of the 'SYSNR' message
MIPS: fix indentation of the 'RELOCS' message
MIPS: boot: fix typo in 'vmlinux.lzma.its' target
s390/mm: fix dynamic pagetable upgrade for hugetlbfs
powerpc/mmu_gather: enable RCU_TABLE_FREE even for !SMP case
powerpc/ptdump: Fix W+X verification
powerpc/xmon: don't access ASDR in VMs
powerpc/pseries: Advance pfn if section is not present in lmb_is_removable()
powerpc/32s: Fix bad_kuap_fault()
powerpc/32s: Fix CPU wake-up from sleep mode
tracing: Fix now invalid var_ref_vals assumption in trace action
PCI: tegra: Fix return value check of pm_runtime_get_sync()
PCI: keystone: Fix outbound region mapping
PCI: keystone: Fix link training retries initiation
PCI: keystone: Fix error handling when "num-viewport" DT property is not populated
mmc: spi: Toggle SPI polarity, do not hardcode it
ACPI: video: Do not export a non working backlight interface on MSI MS-7721 boards
ACPI / battery: Deal with design or full capacity being reported as -1
ACPI / battery: Use design-cap for capacity calculations if full-cap is not available
ACPI / battery: Deal better with neither design nor full capacity not being reported
alarmtimer: Unregister wakeup source when module get fails
fscrypt: don't print name of busy file when removing key
ubifs: don't trigger assertion on invalid no-key filename
ubifs: Fix wrong memory allocation
ubifs: Fix FS_IOC_SETFLAGS unexpectedly clearing encrypt flag
ubifs: Fix deadlock in concurrent bulk-read and writepage
mmc: sdhci-of-at91: fix memleak on clk_get failure
ASoC: SOF: core: free trace on errors
hv_balloon: Balloon up according to request page number
mfd: axp20x: Mark AXP20X_VBUS_IPSOUT_MGMT as volatile
nvmem: core: fix memory abort in cleanup path
crypto: api - Check spawn->alg under lock in crypto_drop_spawn
crypto: ccree - fix backlog memory leak
crypto: ccree - fix AEAD decrypt auth fail
crypto: ccree - fix pm wrongful error reporting
crypto: ccree - fix FDE descriptor sequence
crypto: ccree - fix PM race condition
padata: Remove broken queue flushing
fs: allow deduplication of eof block into the end of the destination file
scripts/find-unused-docs: Fix massive false positives
erofs: fix out-of-bound read for shifted uncompressed block
scsi: megaraid_sas: Do not initiate OCR if controller is not in ready state
scsi: qla2xxx: Fix mtcp dump collection failure
cpupower: Revert library ABI changes from commit ae2917093f
power: supply: axp20x_ac_power: Fix reporting online status
power: supply: ltc2941-battery-gauge: fix use-after-free
ovl: fix wrong WARN_ON() in ovl_cache_update_ino()
ovl: fix lseek overflow on 32bit
f2fs: choose hardlimit when softlimit is larger than hardlimit in f2fs_statfs_project()
f2fs: fix miscounted block limit in f2fs_statfs_project()
f2fs: code cleanup for f2fs_statfs_project()
f2fs: fix dcache lookup of !casefolded directories
f2fs: fix race conditions in ->d_compare() and ->d_hash()
PM: core: Fix handling of devices deleted during system-wide resume
cpufreq: Avoid creating excessively large stack frames
of: Add OF_DMA_DEFAULT_COHERENT & select it on powerpc
ARM: dma-api: fix max_pfn off-by-one error in __dma_supported()
dm zoned: support zone sizes smaller than 128MiB
dm space map common: fix to ensure new block isn't already in use
dm writecache: fix incorrect flush sequence when doing SSD mode commit
dm crypt: fix GFP flags passed to skcipher_request_alloc()
dm crypt: fix benbi IV constructor crash if used in authenticated mode
dm thin metadata: use pool locking at end of dm_pool_metadata_close
dm: fix potential for q->make_request_fn NULL pointer
scsi: qla2xxx: Fix stuck login session using prli_pend_timer
ASoC: SOF: Introduce state machine for FW boot
ASoC: SOF: core: release resources on errors in probe_continue
tracing: Annotate ftrace_graph_hash pointer with __rcu
tracing: Annotate ftrace_graph_notrace_hash pointer with __rcu
ftrace: Add comment to why rcu_dereference_sched() is open coded
ftrace: Protect ftrace_graph_hash with ftrace_sync
crypto: pcrypt - Avoid deadlock by using per-instance padata queues
btrfs: fix improper setting of scanned for range cyclic write cache pages
btrfs: Handle another split brain scenario with metadata uuid feature
riscv, bpf: Fix broken BPF tail calls
selftests/bpf: Fix perf_buffer test on systems w/ offline CPUs
bpf, devmap: Pass lockdep expression to RCU lists
libbpf: Fix realloc usage in bpf_core_find_cands
tc-testing: fix eBPF tests failure on linux fresh clones
samples/bpf: Don't try to remove user's homedir on clean
samples/bpf: Xdp_redirect_cpu fix missing tracepoint attach
selftests/bpf: Fix test_attach_probe
selftests/bpf: Skip perf hw events test if the setup disabled it
selftests: bpf: Use a temporary file in test_sockmap
selftests: bpf: Ignore FIN packets for reuseport tests
crypto: api - fix unexpectedly getting generic implementation
crypto: hisilicon - Use the offset fields in sqe to avoid need to split scatterlists
crypto: ccp - set max RSA modulus size for v3 platform devices as well
crypto: arm64/ghash-neon - bump priority to 150
crypto: pcrypt - Do not clear MAY_SLEEP flag in original request
crypto: atmel-aes - Fix counter overflow in CTR mode
crypto: api - Fix race condition in crypto_spawn_alg
crypto: picoxcell - adjust the position of tasklet_init and fix missed tasklet_kill
powerpc/futex: Fix incorrect user access blocking
scsi: qla2xxx: Fix unbound NVME response length
NFS: Fix memory leaks and corruption in readdir
NFS: Directory page cache pages need to be locked when read
nfsd: fix filecache lookup
jbd2_seq_info_next should increase position index
ext4: fix deadlock allocating crypto bounce page from mempool
ext4: fix race conditions in ->d_compare() and ->d_hash()
Btrfs: fix missing hole after hole punching and fsync when using NO_HOLES
Btrfs: make deduplication with range including the last block work
Btrfs: fix infinite loop during fsync after rename operations
btrfs: set trans->drity in btrfs_commit_transaction
btrfs: drop log root for dropped roots
Btrfs: fix race between adding and putting tree mod seq elements and nodes
btrfs: flush write bio if we loop in extent_write_cache_pages
btrfs: Correctly handle empty trees in find_first_clear_extent_bit
ARM: tegra: Enable PLLP bypass during Tegra124 LP1
iwlwifi: don't throw error when trying to remove IGTK
mwifiex: fix unbalanced locking in mwifiex_process_country_ie()
sunrpc: expiry_time should be seconds not timeval
gfs2: fix gfs2_find_jhead that returns uninitialized jhead with seq 0
gfs2: move setting current->backing_dev_info
gfs2: fix O_SYNC write handling
drm: atmel-hlcdc: use double rate for pixel clock only if supported
drm: atmel-hlcdc: enable clock before configuring timing engine
drm: atmel-hlcdc: prefer a lower pixel-clock than requested
drm/rect: Avoid division by zero
media: iguanair: fix endpoint sanity check
media: rc: ensure lirc is initialized before registering input device
tools/kvm_stat: Fix kvm_exit filter name
xen/balloon: Support xend-based toolstack take two
watchdog: fix UAF in reboot notifier handling in watchdog core code
bcache: add readahead cache policy options via sysfs interface
eventfd: track eventfd_signal() recursion depth
aio: prevent potential eventfd recursion on poll
KVM: x86: Refactor picdev_write() to prevent Spectre-v1/L1TF attacks
KVM: x86: Refactor prefix decoding to prevent Spectre-v1/L1TF attacks
KVM: x86: Protect pmu_intel.c from Spectre-v1/L1TF attacks
KVM: x86: Protect DR-based index computations from Spectre-v1/L1TF attacks
KVM: x86: Protect kvm_lapic_reg_write() from Spectre-v1/L1TF attacks
KVM: x86: Protect kvm_hv_msr_[get|set]_crash_data() from Spectre-v1/L1TF attacks
KVM: x86: Protect ioapic_write_indirect() from Spectre-v1/L1TF attacks
KVM: x86: Protect MSR-based index computations in pmu.h from Spectre-v1/L1TF attacks
KVM: x86: Protect ioapic_read_indirect() from Spectre-v1/L1TF attacks
KVM: x86: Protect MSR-based index computations from Spectre-v1/L1TF attacks in x86.c
KVM: x86: Protect x86_decode_insn from Spectre-v1/L1TF attacks
KVM: x86: Protect MSR-based index computations in fixed_msr_to_seg_unit() from Spectre-v1/L1TF attacks
KVM: x86: Fix potential put_fpu() w/o load_fpu() on MPX platform
KVM: PPC: Book3S HV: Uninit vCPU if vcore creation fails
KVM: PPC: Book3S PR: Free shared page if mmu initialization fails
kvm/svm: PKU not currently supported
x86/kvm: Be careful not to clear KVM_VCPU_FLUSH_TLB bit
x86/kvm: Introduce kvm_(un)map_gfn()
x86/KVM: Make sure KVM_VCPU_FLUSH_TLB flag is not missed
x86/kvm: Cache gfn to pfn translation
x86/KVM: Clean up host's steal time structure
KVM: VMX: Add non-canonical check on writes to RTIT address MSRs
KVM: x86: Don't let userspace set host-reserved cr4 bits
KVM: x86: Free wbinvd_dirty_mask if vCPU creation fails
KVM: x86: Handle TIF_NEED_FPU_LOAD in kvm_{load,put}_guest_fpu()
KVM: x86: Ensure guest's FPU state is loaded when accessing for emulation
KVM: x86: Revert "KVM: X86: Fix fpu state crash in kvm guest"
KVM: s390: do not clobber registers during guest reset/store status
ocfs2: fix oops when writing cloned file
mm/page_alloc.c: fix uninitialized memmaps on a partially populated last section
arm64: dts: qcom: qcs404-evb: Set vdd_apc regulator in high power mode
mm/mmu_gather: invalidate TLB correctly on batch allocation failure and flush
clk: tegra: Mark fuse clock as critical
drm/amd/dm/mst: Ignore payload update failures
virtio-balloon: initialize all vq callbacks
virtio-pci: check name when counting MSI-X vectors
fix up iter on short count in fuse_direct_io()
broken ping to ipv6 linklocal addresses on debian buster
percpu: Separate decrypted varaibles anytime encryption can be enabled
ASoC: meson: axg-fifo: fix fifo threshold setup
scsi: qla2xxx: Fix the endianness of the qla82xx_get_fw_size() return type
scsi: csiostor: Adjust indentation in csio_device_reset
scsi: qla4xxx: Adjust indentation in qla4xxx_mem_free
scsi: ufs: Recheck bkops level if bkops is disabled
mtd: spi-nor: Split mt25qu512a (n25q512a) entry into two
phy: qualcomm: Adjust indentation in read_poll_timeout
ext2: Adjust indentation in ext2_fill_super
powerpc/44x: Adjust indentation in ibm4xx_denali_fixup_memsize
drm: msm: mdp4: Adjust indentation in mdp4_dsi_encoder_enable
NFC: pn544: Adjust indentation in pn544_hci_check_presence
ppp: Adjust indentation into ppp_async_input
net: smc911x: Adjust indentation in smc911x_phy_configure
net: tulip: Adjust indentation in {dmfe, uli526x}_init_module
IB/mlx5: Fix outstanding_pi index for GSI qps
IB/core: Fix ODP get user pages flow
nfsd: fix delay timer on 32-bit architectures
nfsd: fix jiffies/time_t mixup in LRU list
nfsd: Return the correct number of bytes written to the file
virtio-balloon: Fix memory leak when unloading while hinting is in progress
virtio_balloon: Fix memory leaks on errors in virtballoon_probe()
ubi: fastmap: Fix inverted logic in seen selfcheck
ubi: Fix an error pointer dereference in error handling code
ubifs: Fix memory leak from c->sup_node
regulator: core: Add regulator_is_equal() helper
ASoC: sgtl5000: Fix VDDA and VDDIO comparison
bonding/alb: properly access headers in bond_alb_xmit()
devlink: report 0 after hitting end in region read
dpaa_eth: support all modes with rate adapting PHYs
net: dsa: b53: Always use dev->vlan_enabled in b53_configure_vlan()
net: dsa: bcm_sf2: Only 7278 supports 2Gb/sec IMP port
net: dsa: microchip: enable module autoprobe
net: mvneta: move rx_dropped and rx_errors in per-cpu stats
net_sched: fix a resource leak in tcindex_set_parms()
net: stmmac: fix a possible endless loop
net: systemport: Avoid RBUF stuck in Wake-on-LAN mode
net/mlx5: IPsec, Fix esp modify function attribute
net/mlx5: IPsec, fix memory leak at mlx5_fpga_ipsec_delete_sa_ctx
net: macb: Remove unnecessary alignment check for TSO
net: macb: Limit maximum GEM TX length in TSO
taprio: Fix enabling offload with wrong number of traffic classes
taprio: Fix still allowing changing the flags during runtime
taprio: Add missing policy validation for flags
taprio: Use taprio_reset_tc() to reset Traffic Classes configuration
taprio: Fix dropping packets when using taprio + ETF offloading
ipv6/addrconf: fix potential NULL deref in inet6_set_link_af()
qed: Fix timestamping issue for L2 unicast ptp packets.
drop_monitor: Do not cancel uninitialized work item
net/mlx5: Fix deadlock in fs_core
net/mlx5: Deprecate usage of generic TLS HW capability bit
ASoC: Intel: skl_hda_dsp_common: Fix global-out-of-bounds bug
mfd: da9062: Fix watchdog compatible string
mfd: rn5t618: Mark ADC control register volatile
mfd: bd70528: Fix hour register mask
x86/timer: Don't skip PIT setup when APIC is disabled or in legacy mode
btrfs: use bool argument in free_root_pointers()
btrfs: free block groups after free'ing fs trees
drm/dp_mst: Remove VCPI while disabling topology mgr
KVM: x86/mmu: Apply max PA check for MMIO sptes to 32-bit KVM
KVM: x86: use CPUID to locate host page table reserved bits
KVM: x86: Use gpa_t for cr2/gpa to fix TDP support on 32-bit KVM
KVM: x86: fix overlap between SPTE_MMIO_MASK and generation
KVM: nVMX: vmread should not set rflags to specify success in case of #PF
KVM: Use vcpu-specific gva->hva translation when querying host page size
KVM: Play nice with read-only memslots when querying host page size
cifs: fail i/o on soft mounts if sessionsetup errors out
x86/apic/msi: Plug non-maskable MSI affinity race
clocksource: Prevent double add_timer_on() for watchdog_timer
perf/core: Fix mlock accounting in perf_mmap()
rxrpc: Fix service call disconnection
regulator fix for "regulator: core: Add regulator_is_equal() helper"
powerpc/kuap: Fix set direction in allow/prevent_user_access()
Linux 5.4.19
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ief6bae336b8e6931810e5b357c0d5e16fbf1c13e
1159 lines
26 KiB
C
1159 lines
26 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
*
|
|
* Copyright (C) 2011 Novell Inc.
|
|
*/
|
|
|
|
#include <linux/fs.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/namei.h>
|
|
#include <linux/file.h>
|
|
#include <linux/xattr.h>
|
|
#include <linux/rbtree.h>
|
|
#include <linux/security.h>
|
|
#include <linux/cred.h>
|
|
#include <linux/ratelimit.h>
|
|
#include "overlayfs.h"
|
|
|
|
struct ovl_cache_entry {
|
|
unsigned int len;
|
|
unsigned int type;
|
|
u64 real_ino;
|
|
u64 ino;
|
|
struct list_head l_node;
|
|
struct rb_node node;
|
|
struct ovl_cache_entry *next_maybe_whiteout;
|
|
bool is_upper;
|
|
bool is_whiteout;
|
|
char name[];
|
|
};
|
|
|
|
struct ovl_dir_cache {
|
|
long refcount;
|
|
u64 version;
|
|
struct list_head entries;
|
|
struct rb_root root;
|
|
};
|
|
|
|
struct ovl_readdir_data {
|
|
struct dir_context ctx;
|
|
struct dentry *dentry;
|
|
bool is_lowest;
|
|
struct rb_root *root;
|
|
struct list_head *list;
|
|
struct list_head middle;
|
|
struct ovl_cache_entry *first_maybe_whiteout;
|
|
int count;
|
|
int err;
|
|
bool is_upper;
|
|
bool d_type_supported;
|
|
};
|
|
|
|
struct ovl_dir_file {
|
|
bool is_real;
|
|
bool is_upper;
|
|
struct ovl_dir_cache *cache;
|
|
struct list_head *cursor;
|
|
struct file *realfile;
|
|
struct file *upperfile;
|
|
};
|
|
|
|
static struct ovl_cache_entry *ovl_cache_entry_from_node(struct rb_node *n)
|
|
{
|
|
return rb_entry(n, struct ovl_cache_entry, node);
|
|
}
|
|
|
|
static bool ovl_cache_entry_find_link(const char *name, int len,
|
|
struct rb_node ***link,
|
|
struct rb_node **parent)
|
|
{
|
|
bool found = false;
|
|
struct rb_node **newp = *link;
|
|
|
|
while (!found && *newp) {
|
|
int cmp;
|
|
struct ovl_cache_entry *tmp;
|
|
|
|
*parent = *newp;
|
|
tmp = ovl_cache_entry_from_node(*newp);
|
|
cmp = strncmp(name, tmp->name, len);
|
|
if (cmp > 0)
|
|
newp = &tmp->node.rb_right;
|
|
else if (cmp < 0 || len < tmp->len)
|
|
newp = &tmp->node.rb_left;
|
|
else
|
|
found = true;
|
|
}
|
|
*link = newp;
|
|
|
|
return found;
|
|
}
|
|
|
|
static struct ovl_cache_entry *ovl_cache_entry_find(struct rb_root *root,
|
|
const char *name, int len)
|
|
{
|
|
struct rb_node *node = root->rb_node;
|
|
int cmp;
|
|
|
|
while (node) {
|
|
struct ovl_cache_entry *p = ovl_cache_entry_from_node(node);
|
|
|
|
cmp = strncmp(name, p->name, len);
|
|
if (cmp > 0)
|
|
node = p->node.rb_right;
|
|
else if (cmp < 0 || len < p->len)
|
|
node = p->node.rb_left;
|
|
else
|
|
return p;
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
static bool ovl_calc_d_ino(struct ovl_readdir_data *rdd,
|
|
struct ovl_cache_entry *p)
|
|
{
|
|
/* Don't care if not doing ovl_iter() */
|
|
if (!rdd->dentry)
|
|
return false;
|
|
|
|
/* Always recalc d_ino when remapping lower inode numbers */
|
|
if (ovl_xino_bits(rdd->dentry->d_sb))
|
|
return true;
|
|
|
|
/* Always recalc d_ino for parent */
|
|
if (strcmp(p->name, "..") == 0)
|
|
return true;
|
|
|
|
/* If this is lower, then native d_ino will do */
|
|
if (!rdd->is_upper)
|
|
return false;
|
|
|
|
/*
|
|
* Recalc d_ino for '.' and for all entries if dir is impure (contains
|
|
* copied up entries)
|
|
*/
|
|
if ((p->name[0] == '.' && p->len == 1) ||
|
|
ovl_test_flag(OVL_IMPURE, d_inode(rdd->dentry)))
|
|
return true;
|
|
|
|
return false;
|
|
}
|
|
|
|
static struct ovl_cache_entry *ovl_cache_entry_new(struct ovl_readdir_data *rdd,
|
|
const char *name, int len,
|
|
u64 ino, unsigned int d_type)
|
|
{
|
|
struct ovl_cache_entry *p;
|
|
size_t size = offsetof(struct ovl_cache_entry, name[len + 1]);
|
|
|
|
p = kmalloc(size, GFP_KERNEL);
|
|
if (!p)
|
|
return NULL;
|
|
|
|
memcpy(p->name, name, len);
|
|
p->name[len] = '\0';
|
|
p->len = len;
|
|
p->type = d_type;
|
|
p->real_ino = ino;
|
|
p->ino = ino;
|
|
/* Defer setting d_ino for upper entry to ovl_iterate() */
|
|
if (ovl_calc_d_ino(rdd, p))
|
|
p->ino = 0;
|
|
p->is_upper = rdd->is_upper;
|
|
p->is_whiteout = false;
|
|
|
|
if (d_type == DT_CHR) {
|
|
p->next_maybe_whiteout = rdd->first_maybe_whiteout;
|
|
rdd->first_maybe_whiteout = p;
|
|
}
|
|
return p;
|
|
}
|
|
|
|
static int ovl_cache_entry_add_rb(struct ovl_readdir_data *rdd,
|
|
const char *name, int len, u64 ino,
|
|
unsigned int d_type)
|
|
{
|
|
struct rb_node **newp = &rdd->root->rb_node;
|
|
struct rb_node *parent = NULL;
|
|
struct ovl_cache_entry *p;
|
|
|
|
if (ovl_cache_entry_find_link(name, len, &newp, &parent))
|
|
return 0;
|
|
|
|
p = ovl_cache_entry_new(rdd, name, len, ino, d_type);
|
|
if (p == NULL) {
|
|
rdd->err = -ENOMEM;
|
|
return -ENOMEM;
|
|
}
|
|
|
|
list_add_tail(&p->l_node, rdd->list);
|
|
rb_link_node(&p->node, parent, newp);
|
|
rb_insert_color(&p->node, rdd->root);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int ovl_fill_lowest(struct ovl_readdir_data *rdd,
|
|
const char *name, int namelen,
|
|
loff_t offset, u64 ino, unsigned int d_type)
|
|
{
|
|
struct ovl_cache_entry *p;
|
|
|
|
p = ovl_cache_entry_find(rdd->root, name, namelen);
|
|
if (p) {
|
|
list_move_tail(&p->l_node, &rdd->middle);
|
|
} else {
|
|
p = ovl_cache_entry_new(rdd, name, namelen, ino, d_type);
|
|
if (p == NULL)
|
|
rdd->err = -ENOMEM;
|
|
else
|
|
list_add_tail(&p->l_node, &rdd->middle);
|
|
}
|
|
|
|
return rdd->err;
|
|
}
|
|
|
|
void ovl_cache_free(struct list_head *list)
|
|
{
|
|
struct ovl_cache_entry *p;
|
|
struct ovl_cache_entry *n;
|
|
|
|
list_for_each_entry_safe(p, n, list, l_node)
|
|
kfree(p);
|
|
|
|
INIT_LIST_HEAD(list);
|
|
}
|
|
|
|
void ovl_dir_cache_free(struct inode *inode)
|
|
{
|
|
struct ovl_dir_cache *cache = ovl_dir_cache(inode);
|
|
|
|
if (cache) {
|
|
ovl_cache_free(&cache->entries);
|
|
kfree(cache);
|
|
}
|
|
}
|
|
|
|
static void ovl_cache_put(struct ovl_dir_file *od, struct dentry *dentry)
|
|
{
|
|
struct ovl_dir_cache *cache = od->cache;
|
|
|
|
WARN_ON(cache->refcount <= 0);
|
|
cache->refcount--;
|
|
if (!cache->refcount) {
|
|
if (ovl_dir_cache(d_inode(dentry)) == cache)
|
|
ovl_set_dir_cache(d_inode(dentry), NULL);
|
|
|
|
ovl_cache_free(&cache->entries);
|
|
kfree(cache);
|
|
}
|
|
}
|
|
|
|
static int ovl_fill_merge(struct dir_context *ctx, const char *name,
|
|
int namelen, loff_t offset, u64 ino,
|
|
unsigned int d_type)
|
|
{
|
|
struct ovl_readdir_data *rdd =
|
|
container_of(ctx, struct ovl_readdir_data, ctx);
|
|
|
|
rdd->count++;
|
|
if (!rdd->is_lowest)
|
|
return ovl_cache_entry_add_rb(rdd, name, namelen, ino, d_type);
|
|
else
|
|
return ovl_fill_lowest(rdd, name, namelen, offset, ino, d_type);
|
|
}
|
|
|
|
static int ovl_check_whiteouts(struct dentry *dir, struct ovl_readdir_data *rdd)
|
|
{
|
|
int err;
|
|
struct ovl_cache_entry *p;
|
|
struct dentry *dentry;
|
|
const struct cred *old_cred;
|
|
|
|
old_cred = ovl_override_creds(rdd->dentry->d_sb);
|
|
|
|
err = down_write_killable(&dir->d_inode->i_rwsem);
|
|
if (!err) {
|
|
while (rdd->first_maybe_whiteout) {
|
|
p = rdd->first_maybe_whiteout;
|
|
rdd->first_maybe_whiteout = p->next_maybe_whiteout;
|
|
dentry = lookup_one_len(p->name, dir, p->len);
|
|
if (!IS_ERR(dentry)) {
|
|
p->is_whiteout = ovl_is_whiteout(dentry);
|
|
dput(dentry);
|
|
}
|
|
}
|
|
inode_unlock(dir->d_inode);
|
|
}
|
|
ovl_revert_creds(rdd->dentry->d_sb, old_cred);
|
|
|
|
return err;
|
|
}
|
|
|
|
static inline int ovl_dir_read(struct path *realpath,
|
|
struct ovl_readdir_data *rdd)
|
|
{
|
|
struct file *realfile;
|
|
int err;
|
|
|
|
realfile = ovl_path_open(realpath, O_RDONLY | O_DIRECTORY);
|
|
if (IS_ERR(realfile))
|
|
return PTR_ERR(realfile);
|
|
|
|
rdd->first_maybe_whiteout = NULL;
|
|
rdd->ctx.pos = 0;
|
|
do {
|
|
rdd->count = 0;
|
|
rdd->err = 0;
|
|
err = iterate_dir(realfile, &rdd->ctx);
|
|
if (err >= 0)
|
|
err = rdd->err;
|
|
} while (!err && rdd->count);
|
|
|
|
if (!err && rdd->first_maybe_whiteout && rdd->dentry)
|
|
err = ovl_check_whiteouts(realpath->dentry, rdd);
|
|
|
|
fput(realfile);
|
|
|
|
return err;
|
|
}
|
|
|
|
/*
|
|
* Can we iterate real dir directly?
|
|
*
|
|
* Non-merge dir may contain whiteouts from a time it was a merge upper, before
|
|
* lower dir was removed under it and possibly before it was rotated from upper
|
|
* to lower layer.
|
|
*/
|
|
static bool ovl_dir_is_real(struct dentry *dir)
|
|
{
|
|
return !ovl_test_flag(OVL_WHITEOUTS, d_inode(dir));
|
|
}
|
|
|
|
static void ovl_dir_reset(struct file *file)
|
|
{
|
|
struct ovl_dir_file *od = file->private_data;
|
|
struct ovl_dir_cache *cache = od->cache;
|
|
struct dentry *dentry = file->f_path.dentry;
|
|
bool is_real;
|
|
|
|
if (cache && ovl_dentry_version_get(dentry) != cache->version) {
|
|
ovl_cache_put(od, dentry);
|
|
od->cache = NULL;
|
|
od->cursor = NULL;
|
|
}
|
|
is_real = ovl_dir_is_real(dentry);
|
|
if (od->is_real != is_real) {
|
|
/* is_real can only become false when dir is copied up */
|
|
if (WARN_ON(is_real))
|
|
return;
|
|
od->is_real = false;
|
|
}
|
|
}
|
|
|
|
static int ovl_dir_read_merged(struct dentry *dentry, struct list_head *list,
|
|
struct rb_root *root)
|
|
{
|
|
int err;
|
|
struct path realpath;
|
|
struct ovl_readdir_data rdd = {
|
|
.ctx.actor = ovl_fill_merge,
|
|
.dentry = dentry,
|
|
.list = list,
|
|
.root = root,
|
|
.is_lowest = false,
|
|
};
|
|
int idx, next;
|
|
|
|
for (idx = 0; idx != -1; idx = next) {
|
|
next = ovl_path_next(idx, dentry, &realpath);
|
|
rdd.is_upper = ovl_dentry_upper(dentry) == realpath.dentry;
|
|
|
|
if (next != -1) {
|
|
err = ovl_dir_read(&realpath, &rdd);
|
|
if (err)
|
|
break;
|
|
} else {
|
|
/*
|
|
* Insert lowest layer entries before upper ones, this
|
|
* allows offsets to be reasonably constant
|
|
*/
|
|
list_add(&rdd.middle, rdd.list);
|
|
rdd.is_lowest = true;
|
|
err = ovl_dir_read(&realpath, &rdd);
|
|
list_del(&rdd.middle);
|
|
}
|
|
}
|
|
return err;
|
|
}
|
|
|
|
static void ovl_seek_cursor(struct ovl_dir_file *od, loff_t pos)
|
|
{
|
|
struct list_head *p;
|
|
loff_t off = 0;
|
|
|
|
list_for_each(p, &od->cache->entries) {
|
|
if (off >= pos)
|
|
break;
|
|
off++;
|
|
}
|
|
/* Cursor is safe since the cache is stable */
|
|
od->cursor = p;
|
|
}
|
|
|
|
static struct ovl_dir_cache *ovl_cache_get(struct dentry *dentry)
|
|
{
|
|
int res;
|
|
struct ovl_dir_cache *cache;
|
|
|
|
cache = ovl_dir_cache(d_inode(dentry));
|
|
if (cache && ovl_dentry_version_get(dentry) == cache->version) {
|
|
WARN_ON(!cache->refcount);
|
|
cache->refcount++;
|
|
return cache;
|
|
}
|
|
ovl_set_dir_cache(d_inode(dentry), NULL);
|
|
|
|
cache = kzalloc(sizeof(struct ovl_dir_cache), GFP_KERNEL);
|
|
if (!cache)
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
cache->refcount = 1;
|
|
INIT_LIST_HEAD(&cache->entries);
|
|
cache->root = RB_ROOT;
|
|
|
|
res = ovl_dir_read_merged(dentry, &cache->entries, &cache->root);
|
|
if (res) {
|
|
ovl_cache_free(&cache->entries);
|
|
kfree(cache);
|
|
return ERR_PTR(res);
|
|
}
|
|
|
|
cache->version = ovl_dentry_version_get(dentry);
|
|
ovl_set_dir_cache(d_inode(dentry), cache);
|
|
|
|
return cache;
|
|
}
|
|
|
|
/* Map inode number to lower fs unique range */
|
|
static u64 ovl_remap_lower_ino(u64 ino, int xinobits, int fsid,
|
|
const char *name, int namelen)
|
|
{
|
|
if (ino >> (64 - xinobits)) {
|
|
pr_warn_ratelimited("overlayfs: d_ino too big (%.*s, ino=%llu, xinobits=%d)\n",
|
|
namelen, name, ino, xinobits);
|
|
return ino;
|
|
}
|
|
|
|
return ino | ((u64)fsid) << (64 - xinobits);
|
|
}
|
|
|
|
/*
|
|
* Set d_ino for upper entries. Non-upper entries should always report
|
|
* the uppermost real inode ino and should not call this function.
|
|
*
|
|
* When not all layer are on same fs, report real ino also for upper.
|
|
*
|
|
* When all layers are on the same fs, and upper has a reference to
|
|
* copy up origin, call vfs_getattr() on the overlay entry to make
|
|
* sure that d_ino will be consistent with st_ino from stat(2).
|
|
*/
|
|
static int ovl_cache_update_ino(struct path *path, struct ovl_cache_entry *p)
|
|
|
|
{
|
|
struct dentry *dir = path->dentry;
|
|
struct dentry *this = NULL;
|
|
enum ovl_path_type type;
|
|
u64 ino = p->real_ino;
|
|
int xinobits = ovl_xino_bits(dir->d_sb);
|
|
int err = 0;
|
|
|
|
if (!ovl_same_sb(dir->d_sb) && !xinobits)
|
|
goto out;
|
|
|
|
if (p->name[0] == '.') {
|
|
if (p->len == 1) {
|
|
this = dget(dir);
|
|
goto get;
|
|
}
|
|
if (p->len == 2 && p->name[1] == '.') {
|
|
/* we shall not be moved */
|
|
this = dget(dir->d_parent);
|
|
goto get;
|
|
}
|
|
}
|
|
this = lookup_one_len(p->name, dir, p->len);
|
|
if (IS_ERR_OR_NULL(this) || !this->d_inode) {
|
|
if (IS_ERR(this)) {
|
|
err = PTR_ERR(this);
|
|
this = NULL;
|
|
goto fail;
|
|
}
|
|
goto out;
|
|
}
|
|
|
|
get:
|
|
type = ovl_path_type(this);
|
|
if (OVL_TYPE_ORIGIN(type)) {
|
|
struct kstat stat;
|
|
struct path statpath = *path;
|
|
|
|
statpath.dentry = this;
|
|
err = vfs_getattr(&statpath, &stat, STATX_INO, 0);
|
|
if (err)
|
|
goto fail;
|
|
|
|
/*
|
|
* Directory inode is always on overlay st_dev.
|
|
* Non-dir with ovl_same_dev() could be on pseudo st_dev in case
|
|
* of xino bits overflow.
|
|
*/
|
|
WARN_ON_ONCE(S_ISDIR(stat.mode) &&
|
|
dir->d_sb->s_dev != stat.dev);
|
|
ino = stat.ino;
|
|
} else if (xinobits && !OVL_TYPE_UPPER(type)) {
|
|
ino = ovl_remap_lower_ino(ino, xinobits,
|
|
ovl_layer_lower(this)->fsid,
|
|
p->name, p->len);
|
|
}
|
|
|
|
out:
|
|
p->ino = ino;
|
|
dput(this);
|
|
return err;
|
|
|
|
fail:
|
|
pr_warn_ratelimited("overlayfs: failed to look up (%s) for ino (%i)\n",
|
|
p->name, err);
|
|
goto out;
|
|
}
|
|
|
|
static int ovl_fill_plain(struct dir_context *ctx, const char *name,
|
|
int namelen, loff_t offset, u64 ino,
|
|
unsigned int d_type)
|
|
{
|
|
struct ovl_cache_entry *p;
|
|
struct ovl_readdir_data *rdd =
|
|
container_of(ctx, struct ovl_readdir_data, ctx);
|
|
|
|
rdd->count++;
|
|
p = ovl_cache_entry_new(rdd, name, namelen, ino, d_type);
|
|
if (p == NULL) {
|
|
rdd->err = -ENOMEM;
|
|
return -ENOMEM;
|
|
}
|
|
list_add_tail(&p->l_node, rdd->list);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int ovl_dir_read_impure(struct path *path, struct list_head *list,
|
|
struct rb_root *root)
|
|
{
|
|
int err;
|
|
struct path realpath;
|
|
struct ovl_cache_entry *p, *n;
|
|
struct ovl_readdir_data rdd = {
|
|
.ctx.actor = ovl_fill_plain,
|
|
.list = list,
|
|
.root = root,
|
|
};
|
|
|
|
INIT_LIST_HEAD(list);
|
|
*root = RB_ROOT;
|
|
ovl_path_upper(path->dentry, &realpath);
|
|
|
|
err = ovl_dir_read(&realpath, &rdd);
|
|
if (err)
|
|
return err;
|
|
|
|
list_for_each_entry_safe(p, n, list, l_node) {
|
|
if (strcmp(p->name, ".") != 0 &&
|
|
strcmp(p->name, "..") != 0) {
|
|
err = ovl_cache_update_ino(path, p);
|
|
if (err)
|
|
return err;
|
|
}
|
|
if (p->ino == p->real_ino) {
|
|
list_del(&p->l_node);
|
|
kfree(p);
|
|
} else {
|
|
struct rb_node **newp = &root->rb_node;
|
|
struct rb_node *parent = NULL;
|
|
|
|
if (WARN_ON(ovl_cache_entry_find_link(p->name, p->len,
|
|
&newp, &parent)))
|
|
return -EIO;
|
|
|
|
rb_link_node(&p->node, parent, newp);
|
|
rb_insert_color(&p->node, root);
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static struct ovl_dir_cache *ovl_cache_get_impure(struct path *path)
|
|
{
|
|
int res;
|
|
struct dentry *dentry = path->dentry;
|
|
struct ovl_dir_cache *cache;
|
|
|
|
cache = ovl_dir_cache(d_inode(dentry));
|
|
if (cache && ovl_dentry_version_get(dentry) == cache->version)
|
|
return cache;
|
|
|
|
/* Impure cache is not refcounted, free it here */
|
|
ovl_dir_cache_free(d_inode(dentry));
|
|
ovl_set_dir_cache(d_inode(dentry), NULL);
|
|
|
|
cache = kzalloc(sizeof(struct ovl_dir_cache), GFP_KERNEL);
|
|
if (!cache)
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
res = ovl_dir_read_impure(path, &cache->entries, &cache->root);
|
|
if (res) {
|
|
ovl_cache_free(&cache->entries);
|
|
kfree(cache);
|
|
return ERR_PTR(res);
|
|
}
|
|
if (list_empty(&cache->entries)) {
|
|
/*
|
|
* A good opportunity to get rid of an unneeded "impure" flag.
|
|
* Removing the "impure" xattr is best effort.
|
|
*/
|
|
if (!ovl_want_write(dentry)) {
|
|
ovl_do_removexattr(ovl_dentry_upper(dentry),
|
|
OVL_XATTR_IMPURE);
|
|
ovl_drop_write(dentry);
|
|
}
|
|
ovl_clear_flag(OVL_IMPURE, d_inode(dentry));
|
|
kfree(cache);
|
|
return NULL;
|
|
}
|
|
|
|
cache->version = ovl_dentry_version_get(dentry);
|
|
ovl_set_dir_cache(d_inode(dentry), cache);
|
|
|
|
return cache;
|
|
}
|
|
|
|
struct ovl_readdir_translate {
|
|
struct dir_context *orig_ctx;
|
|
struct ovl_dir_cache *cache;
|
|
struct dir_context ctx;
|
|
u64 parent_ino;
|
|
int fsid;
|
|
int xinobits;
|
|
};
|
|
|
|
static int ovl_fill_real(struct dir_context *ctx, const char *name,
|
|
int namelen, loff_t offset, u64 ino,
|
|
unsigned int d_type)
|
|
{
|
|
struct ovl_readdir_translate *rdt =
|
|
container_of(ctx, struct ovl_readdir_translate, ctx);
|
|
struct dir_context *orig_ctx = rdt->orig_ctx;
|
|
|
|
if (rdt->parent_ino && strcmp(name, "..") == 0) {
|
|
ino = rdt->parent_ino;
|
|
} else if (rdt->cache) {
|
|
struct ovl_cache_entry *p;
|
|
|
|
p = ovl_cache_entry_find(&rdt->cache->root, name, namelen);
|
|
if (p)
|
|
ino = p->ino;
|
|
} else if (rdt->xinobits) {
|
|
ino = ovl_remap_lower_ino(ino, rdt->xinobits, rdt->fsid,
|
|
name, namelen);
|
|
}
|
|
|
|
return orig_ctx->actor(orig_ctx, name, namelen, offset, ino, d_type);
|
|
}
|
|
|
|
static bool ovl_is_impure_dir(struct file *file)
|
|
{
|
|
struct ovl_dir_file *od = file->private_data;
|
|
struct inode *dir = d_inode(file->f_path.dentry);
|
|
|
|
/*
|
|
* Only upper dir can be impure, but if we are in the middle of
|
|
* iterating a lower real dir, dir could be copied up and marked
|
|
* impure. We only want the impure cache if we started iterating
|
|
* a real upper dir to begin with.
|
|
*/
|
|
return od->is_upper && ovl_test_flag(OVL_IMPURE, dir);
|
|
|
|
}
|
|
|
|
static int ovl_iterate_real(struct file *file, struct dir_context *ctx)
|
|
{
|
|
int err;
|
|
struct ovl_dir_file *od = file->private_data;
|
|
struct dentry *dir = file->f_path.dentry;
|
|
struct ovl_layer *lower_layer = ovl_layer_lower(dir);
|
|
struct ovl_readdir_translate rdt = {
|
|
.ctx.actor = ovl_fill_real,
|
|
.orig_ctx = ctx,
|
|
.xinobits = ovl_xino_bits(dir->d_sb),
|
|
};
|
|
|
|
if (rdt.xinobits && lower_layer)
|
|
rdt.fsid = lower_layer->fsid;
|
|
|
|
if (OVL_TYPE_MERGE(ovl_path_type(dir->d_parent))) {
|
|
struct kstat stat;
|
|
struct path statpath = file->f_path;
|
|
|
|
statpath.dentry = dir->d_parent;
|
|
err = vfs_getattr(&statpath, &stat, STATX_INO, 0);
|
|
if (err)
|
|
return err;
|
|
|
|
WARN_ON_ONCE(dir->d_sb->s_dev != stat.dev);
|
|
rdt.parent_ino = stat.ino;
|
|
}
|
|
|
|
if (ovl_is_impure_dir(file)) {
|
|
rdt.cache = ovl_cache_get_impure(&file->f_path);
|
|
if (IS_ERR(rdt.cache))
|
|
return PTR_ERR(rdt.cache);
|
|
}
|
|
|
|
err = iterate_dir(od->realfile, &rdt.ctx);
|
|
ctx->pos = rdt.ctx.pos;
|
|
|
|
return err;
|
|
}
|
|
|
|
|
|
static int ovl_iterate(struct file *file, struct dir_context *ctx)
|
|
{
|
|
struct ovl_dir_file *od = file->private_data;
|
|
struct dentry *dentry = file->f_path.dentry;
|
|
struct ovl_cache_entry *p;
|
|
int err;
|
|
|
|
if (!ctx->pos)
|
|
ovl_dir_reset(file);
|
|
|
|
if (od->is_real) {
|
|
/*
|
|
* If parent is merge, then need to adjust d_ino for '..', if
|
|
* dir is impure then need to adjust d_ino for copied up
|
|
* entries.
|
|
*/
|
|
if (ovl_xino_bits(dentry->d_sb) ||
|
|
(ovl_same_sb(dentry->d_sb) &&
|
|
(ovl_is_impure_dir(file) ||
|
|
OVL_TYPE_MERGE(ovl_path_type(dentry->d_parent))))) {
|
|
return ovl_iterate_real(file, ctx);
|
|
}
|
|
return iterate_dir(od->realfile, ctx);
|
|
}
|
|
|
|
if (!od->cache) {
|
|
struct ovl_dir_cache *cache;
|
|
|
|
cache = ovl_cache_get(dentry);
|
|
if (IS_ERR(cache))
|
|
return PTR_ERR(cache);
|
|
|
|
od->cache = cache;
|
|
ovl_seek_cursor(od, ctx->pos);
|
|
}
|
|
|
|
while (od->cursor != &od->cache->entries) {
|
|
p = list_entry(od->cursor, struct ovl_cache_entry, l_node);
|
|
if (!p->is_whiteout) {
|
|
if (!p->ino) {
|
|
err = ovl_cache_update_ino(&file->f_path, p);
|
|
if (err)
|
|
return err;
|
|
}
|
|
if (!dir_emit(ctx, p->name, p->len, p->ino, p->type))
|
|
break;
|
|
}
|
|
od->cursor = p->l_node.next;
|
|
ctx->pos++;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static loff_t ovl_dir_llseek(struct file *file, loff_t offset, int origin)
|
|
{
|
|
loff_t res;
|
|
struct ovl_dir_file *od = file->private_data;
|
|
|
|
inode_lock(file_inode(file));
|
|
if (!file->f_pos)
|
|
ovl_dir_reset(file);
|
|
|
|
if (od->is_real) {
|
|
res = vfs_llseek(od->realfile, offset, origin);
|
|
file->f_pos = od->realfile->f_pos;
|
|
} else {
|
|
res = -EINVAL;
|
|
|
|
switch (origin) {
|
|
case SEEK_CUR:
|
|
offset += file->f_pos;
|
|
break;
|
|
case SEEK_SET:
|
|
break;
|
|
default:
|
|
goto out_unlock;
|
|
}
|
|
if (offset < 0)
|
|
goto out_unlock;
|
|
|
|
if (offset != file->f_pos) {
|
|
file->f_pos = offset;
|
|
if (od->cache)
|
|
ovl_seek_cursor(od, offset);
|
|
}
|
|
res = offset;
|
|
}
|
|
out_unlock:
|
|
inode_unlock(file_inode(file));
|
|
|
|
return res;
|
|
}
|
|
|
|
static int ovl_dir_fsync(struct file *file, loff_t start, loff_t end,
|
|
int datasync)
|
|
{
|
|
struct ovl_dir_file *od = file->private_data;
|
|
struct dentry *dentry = file->f_path.dentry;
|
|
struct file *realfile = od->realfile;
|
|
|
|
/* Nothing to sync for lower */
|
|
if (!OVL_TYPE_UPPER(ovl_path_type(dentry)))
|
|
return 0;
|
|
|
|
/*
|
|
* Need to check if we started out being a lower dir, but got copied up
|
|
*/
|
|
if (!od->is_upper) {
|
|
struct inode *inode = file_inode(file);
|
|
|
|
realfile = READ_ONCE(od->upperfile);
|
|
if (!realfile) {
|
|
struct path upperpath;
|
|
|
|
ovl_path_upper(dentry, &upperpath);
|
|
realfile = ovl_path_open(&upperpath, O_RDONLY);
|
|
|
|
inode_lock(inode);
|
|
if (!od->upperfile) {
|
|
if (IS_ERR(realfile)) {
|
|
inode_unlock(inode);
|
|
return PTR_ERR(realfile);
|
|
}
|
|
smp_store_release(&od->upperfile, realfile);
|
|
} else {
|
|
/* somebody has beaten us to it */
|
|
if (!IS_ERR(realfile))
|
|
fput(realfile);
|
|
realfile = od->upperfile;
|
|
}
|
|
inode_unlock(inode);
|
|
}
|
|
}
|
|
|
|
return vfs_fsync_range(realfile, start, end, datasync);
|
|
}
|
|
|
|
static int ovl_dir_release(struct inode *inode, struct file *file)
|
|
{
|
|
struct ovl_dir_file *od = file->private_data;
|
|
|
|
if (od->cache) {
|
|
inode_lock(inode);
|
|
ovl_cache_put(od, file->f_path.dentry);
|
|
inode_unlock(inode);
|
|
}
|
|
fput(od->realfile);
|
|
if (od->upperfile)
|
|
fput(od->upperfile);
|
|
kfree(od);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int ovl_dir_open(struct inode *inode, struct file *file)
|
|
{
|
|
struct path realpath;
|
|
struct file *realfile;
|
|
struct ovl_dir_file *od;
|
|
enum ovl_path_type type;
|
|
|
|
od = kzalloc(sizeof(struct ovl_dir_file), GFP_KERNEL);
|
|
if (!od)
|
|
return -ENOMEM;
|
|
|
|
type = ovl_path_real(file->f_path.dentry, &realpath);
|
|
realfile = ovl_path_open(&realpath, file->f_flags);
|
|
if (IS_ERR(realfile)) {
|
|
kfree(od);
|
|
return PTR_ERR(realfile);
|
|
}
|
|
od->realfile = realfile;
|
|
od->is_real = ovl_dir_is_real(file->f_path.dentry);
|
|
od->is_upper = OVL_TYPE_UPPER(type);
|
|
file->private_data = od;
|
|
|
|
return 0;
|
|
}
|
|
|
|
const struct file_operations ovl_dir_operations = {
|
|
.read = generic_read_dir,
|
|
.open = ovl_dir_open,
|
|
.iterate = ovl_iterate,
|
|
.llseek = ovl_dir_llseek,
|
|
.fsync = ovl_dir_fsync,
|
|
.release = ovl_dir_release,
|
|
};
|
|
|
|
int ovl_check_empty_dir(struct dentry *dentry, struct list_head *list)
|
|
{
|
|
int err;
|
|
struct ovl_cache_entry *p, *n;
|
|
struct rb_root root = RB_ROOT;
|
|
const struct cred *old_cred;
|
|
|
|
old_cred = ovl_override_creds(dentry->d_sb);
|
|
err = ovl_dir_read_merged(dentry, list, &root);
|
|
ovl_revert_creds(dentry->d_sb, old_cred);
|
|
if (err)
|
|
return err;
|
|
|
|
err = 0;
|
|
|
|
list_for_each_entry_safe(p, n, list, l_node) {
|
|
/*
|
|
* Select whiteouts in upperdir, they should
|
|
* be cleared when deleting this directory.
|
|
*/
|
|
if (p->is_whiteout) {
|
|
if (p->is_upper)
|
|
continue;
|
|
goto del_entry;
|
|
}
|
|
|
|
if (p->name[0] == '.') {
|
|
if (p->len == 1)
|
|
goto del_entry;
|
|
if (p->len == 2 && p->name[1] == '.')
|
|
goto del_entry;
|
|
}
|
|
err = -ENOTEMPTY;
|
|
break;
|
|
|
|
del_entry:
|
|
list_del(&p->l_node);
|
|
kfree(p);
|
|
}
|
|
|
|
return err;
|
|
}
|
|
|
|
void ovl_cleanup_whiteouts(struct dentry *upper, struct list_head *list)
|
|
{
|
|
struct ovl_cache_entry *p;
|
|
|
|
inode_lock_nested(upper->d_inode, I_MUTEX_CHILD);
|
|
list_for_each_entry(p, list, l_node) {
|
|
struct dentry *dentry;
|
|
|
|
if (WARN_ON(!p->is_whiteout || !p->is_upper))
|
|
continue;
|
|
|
|
dentry = lookup_one_len(p->name, upper, p->len);
|
|
if (IS_ERR(dentry)) {
|
|
pr_err("overlayfs: lookup '%s/%.*s' failed (%i)\n",
|
|
upper->d_name.name, p->len, p->name,
|
|
(int) PTR_ERR(dentry));
|
|
continue;
|
|
}
|
|
if (dentry->d_inode)
|
|
ovl_cleanup(upper->d_inode, dentry);
|
|
dput(dentry);
|
|
}
|
|
inode_unlock(upper->d_inode);
|
|
}
|
|
|
|
static int ovl_check_d_type(struct dir_context *ctx, const char *name,
|
|
int namelen, loff_t offset, u64 ino,
|
|
unsigned int d_type)
|
|
{
|
|
struct ovl_readdir_data *rdd =
|
|
container_of(ctx, struct ovl_readdir_data, ctx);
|
|
|
|
/* Even if d_type is not supported, DT_DIR is returned for . and .. */
|
|
if (!strncmp(name, ".", namelen) || !strncmp(name, "..", namelen))
|
|
return 0;
|
|
|
|
if (d_type != DT_UNKNOWN)
|
|
rdd->d_type_supported = true;
|
|
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* Returns 1 if d_type is supported, 0 not supported/unknown. Negative values
|
|
* if error is encountered.
|
|
*/
|
|
int ovl_check_d_type_supported(struct path *realpath)
|
|
{
|
|
int err;
|
|
struct ovl_readdir_data rdd = {
|
|
.ctx.actor = ovl_check_d_type,
|
|
.d_type_supported = false,
|
|
};
|
|
|
|
err = ovl_dir_read(realpath, &rdd);
|
|
if (err)
|
|
return err;
|
|
|
|
return rdd.d_type_supported;
|
|
}
|
|
|
|
static void ovl_workdir_cleanup_recurse(struct path *path, int level)
|
|
{
|
|
int err;
|
|
struct inode *dir = path->dentry->d_inode;
|
|
LIST_HEAD(list);
|
|
struct rb_root root = RB_ROOT;
|
|
struct ovl_cache_entry *p;
|
|
struct ovl_readdir_data rdd = {
|
|
.ctx.actor = ovl_fill_merge,
|
|
.dentry = NULL,
|
|
.list = &list,
|
|
.root = &root,
|
|
.is_lowest = false,
|
|
};
|
|
|
|
err = ovl_dir_read(path, &rdd);
|
|
if (err)
|
|
goto out;
|
|
|
|
inode_lock_nested(dir, I_MUTEX_PARENT);
|
|
list_for_each_entry(p, &list, l_node) {
|
|
struct dentry *dentry;
|
|
|
|
if (p->name[0] == '.') {
|
|
if (p->len == 1)
|
|
continue;
|
|
if (p->len == 2 && p->name[1] == '.')
|
|
continue;
|
|
}
|
|
dentry = lookup_one_len(p->name, path->dentry, p->len);
|
|
if (IS_ERR(dentry))
|
|
continue;
|
|
if (dentry->d_inode)
|
|
ovl_workdir_cleanup(dir, path->mnt, dentry, level);
|
|
dput(dentry);
|
|
}
|
|
inode_unlock(dir);
|
|
out:
|
|
ovl_cache_free(&list);
|
|
}
|
|
|
|
void ovl_workdir_cleanup(struct inode *dir, struct vfsmount *mnt,
|
|
struct dentry *dentry, int level)
|
|
{
|
|
int err;
|
|
|
|
if (!d_is_dir(dentry) || level > 1) {
|
|
ovl_cleanup(dir, dentry);
|
|
return;
|
|
}
|
|
|
|
err = ovl_do_rmdir(dir, dentry);
|
|
if (err) {
|
|
struct path path = { .mnt = mnt, .dentry = dentry };
|
|
|
|
inode_unlock(dir);
|
|
ovl_workdir_cleanup_recurse(&path, level + 1);
|
|
inode_lock_nested(dir, I_MUTEX_PARENT);
|
|
ovl_cleanup(dir, dentry);
|
|
}
|
|
}
|
|
|
|
int ovl_indexdir_cleanup(struct ovl_fs *ofs)
|
|
{
|
|
int err;
|
|
struct dentry *indexdir = ofs->indexdir;
|
|
struct dentry *index = NULL;
|
|
struct inode *dir = indexdir->d_inode;
|
|
struct path path = { .mnt = ofs->upper_mnt, .dentry = indexdir };
|
|
LIST_HEAD(list);
|
|
struct rb_root root = RB_ROOT;
|
|
struct ovl_cache_entry *p;
|
|
struct ovl_readdir_data rdd = {
|
|
.ctx.actor = ovl_fill_merge,
|
|
.dentry = NULL,
|
|
.list = &list,
|
|
.root = &root,
|
|
.is_lowest = false,
|
|
};
|
|
|
|
err = ovl_dir_read(&path, &rdd);
|
|
if (err)
|
|
goto out;
|
|
|
|
inode_lock_nested(dir, I_MUTEX_PARENT);
|
|
list_for_each_entry(p, &list, l_node) {
|
|
if (p->name[0] == '.') {
|
|
if (p->len == 1)
|
|
continue;
|
|
if (p->len == 2 && p->name[1] == '.')
|
|
continue;
|
|
}
|
|
index = lookup_one_len(p->name, indexdir, p->len);
|
|
if (IS_ERR(index)) {
|
|
err = PTR_ERR(index);
|
|
index = NULL;
|
|
break;
|
|
}
|
|
err = ovl_verify_index(ofs, index);
|
|
if (!err) {
|
|
goto next;
|
|
} else if (err == -ESTALE) {
|
|
/* Cleanup stale index entries */
|
|
err = ovl_cleanup(dir, index);
|
|
} else if (err != -ENOENT) {
|
|
/*
|
|
* Abort mount to avoid corrupting the index if
|
|
* an incompatible index entry was found or on out
|
|
* of memory.
|
|
*/
|
|
break;
|
|
} else if (ofs->config.nfs_export) {
|
|
/*
|
|
* Whiteout orphan index to block future open by
|
|
* handle after overlay nlink dropped to zero.
|
|
*/
|
|
err = ovl_cleanup_and_whiteout(indexdir, dir, index);
|
|
} else {
|
|
/* Cleanup orphan index entries */
|
|
err = ovl_cleanup(dir, index);
|
|
}
|
|
|
|
if (err)
|
|
break;
|
|
|
|
next:
|
|
dput(index);
|
|
index = NULL;
|
|
}
|
|
dput(index);
|
|
inode_unlock(dir);
|
|
out:
|
|
ovl_cache_free(&list);
|
|
if (err)
|
|
pr_err("overlayfs: failed index dir cleanup (%i)\n", err);
|
|
return err;
|
|
}
|