32b16a3a3f
-----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmCACCYACgkQONu9yGCS aT7BkA//ZVfIoUb4EThpqWz3qjHCxQ5jqOH3XT//a2hhAFBp8wZAe4JRf76oqKyz G+2ZPQFU+susfhvYQVcxp2C6A9XomRSlX00MqFsKVrcOPG/IL/iBdNgBma/ajG8R 0ARmgTBZBt+3i3nED5i26SzBR3vFx0lrwU3zaZoivAQpDkzzHFte++s4lLqSEY8i rxEe0sUm6HpsXiuRPkNU2yH1/2immgypbIYNaaOjPGxIO4aKouPGIMZtEm5/w3Oi h+eDSQH8fCN5jJjX9sGIqiK1XJEeS+hyUPsSjKypytVkRLqHEXE3Dcau24giHfEm iWM8Xh16Nudvh0vnWNfsMGZeghKwgLr71OnW4AcPe6dCG7fh4cKvyAuXFneL2PeZ NgGEFKIsFNXtaPLNn8peot3TeSemMdkuc2ORdiq2OKmU1umkczF6Y5L38JxMWEnZ /FoPIhigqobF0AujaFK/wKu5eznZDGiZqRpluJLF2yZYbHAEiDjwemSb+Xa6tmpe wXFIhu6ipQlKhqFfIGo1sIKachXkk/CvKwbFPUYh+CjZGgls9nZH0sGSNVa+p2BY 7k+I7CfRZgAjWd1W0UM5J2oZ2uVU66zBH3SwF2RBbsWhi+btvfzMhVQIK1FJwJFQ bsuVegUAwR5mSVlBk2QpLIDJ55BqPXOorba7i8CuAoUjETr1MEY= =YPgE -----END PGP SIGNATURE----- Merge 5.10.32 into android12-5.10 Changes in 5.10.32 net/sctp: fix race condition in sctp_destroy_sock mtd: rawnand: mtk: Fix WAITRDY break condition and timeout Input: nspire-keypad - enable interrupts only when opened gpio: sysfs: Obey valid_mask dmaengine: idxd: Fix clobbering of SWERR overflow bit on writeback dmaengine: idxd: fix delta_rec and crc size field for completion record dmaengine: idxd: fix opcap sysfs attribute output dmaengine: idxd: fix wq size store permission state dmaengine: dw: Make it dependent to HAS_IOMEM dmaengine: Fix a double free in dma_async_device_register dmaengine: plx_dma: add a missing put_device() on error path dmaengine: idxd: fix wq cleanup of WQCFG registers ACPI: x86: Call acpi_boot_table_init() after acpi_table_upgrade() ARM: dts: Drop duplicate sha2md5_fck to fix clk_disable race ARM: dts: Fix moving mmc devices with aliases for omap4 & 5 lockdep: Add a missing initialization hint to the "INFO: Trying to register non-static key" message arc: kernel: Return -EFAULT if copy_to_user() fails iwlwifi: Fix softirq/hardirq disabling in iwl_pcie_enqueue_hcmd() xfrm: BEET mode doesn't support fragments for inner packets ASoC: max98373: Changed amp shutdown register as volatile ASoC: max98373: Added 30ms turn on/off time delay gpu/xen: Fix a use after free in xen_drm_drv_init neighbour: Disregard DEAD dst in neigh_update ARM: keystone: fix integer overflow warning ARM: omap1: fix building with clang IAS drm/msm: Fix a5xx/a6xx timestamps ASoC: fsl_esai: Fix TDM slot setup for I2S mode scsi: scsi_transport_srp: Don't block target in SRP_PORT_LOST state iwlwifi: add support for Qu with AX201 device net: ieee802154: stop dump llsec keys for monitors net: ieee802154: forbid monitor for add llsec key net: ieee802154: forbid monitor for del llsec key net: ieee802154: stop dump llsec devs for monitors net: ieee802154: forbid monitor for add llsec dev net: ieee802154: forbid monitor for del llsec dev net: ieee802154: stop dump llsec devkeys for monitors net: ieee802154: forbid monitor for add llsec devkey net: ieee802154: forbid monitor for del llsec devkey net: ieee802154: stop dump llsec seclevels for monitors net: ieee802154: forbid monitor for add llsec seclevel pcnet32: Use pci_resource_len to validate PCI resource mac80211: clear sta->fast_rx when STA removed from 4-addr VLAN virt_wifi: Return micros for BSS TSF values lib: fix kconfig dependency on ARCH_WANT_FRAME_POINTERS Input: s6sy761 - fix coordinate read bit shift Input: i8042 - fix Pegatron C15B ID entry HID: wacom: set EV_KEY and EV_ABS only for non-HID_GENERIC type of devices dm verity fec: fix misaligned RS roots IO readdir: make sure to verify directory entry for legacy interfaces too arm64: fix inline asm in load_unaligned_zeropad() arm64: alternatives: Move length validation in alternative_{insn, endif} vfio/pci: Add missing range check in vfio_pci_mmap riscv: Fix spelling mistake "SPARSEMEM" to "SPARSMEM" scsi: libsas: Reset num_scatter if libata marks qc as NODATA ixgbe: fix unbalanced device enable/disable in suspend/resume netfilter: flowtable: fix NAT IPv6 offload mangling netfilter: conntrack: do not print icmpv6 as unknown via /proc ice: Fix potential infinite loop when using u8 loop counter libnvdimm/region: Fix nvdimm_has_flush() to handle ND_REGION_ASYNC netfilter: bridge: add pre_exit hooks for ebtable unregistration netfilter: arp_tables: add pre_exit hook for table unregister libbpf: Fix potential NULL pointer dereference net: macb: fix the restore of cmp registers net/mlx5e: fix ingress_ifindex check in mlx5e_flower_parse_meta netfilter: nft_limit: avoid possible divide error in nft_limit_init net/mlx5e: Fix setting of RS FEC mode net: davicom: Fix regulator not turned off on failed probe net: sit: Unregister catch-all devices net: ip6_tunnel: Unregister catch-all devices mm: ptdump: fix build failure net: Make tcp_allowed_congestion_control readonly in non-init netns i40e: fix the panic when running bpf in xdpdrv mode ethtool: pause: make sure we init driver stats ia64: remove duplicate entries in generic_defconfig ia64: tools: remove inclusion of ia64-specific version of errno.h header ibmvnic: avoid calling napi_disable() twice ibmvnic: remove duplicate napi_schedule call in do_reset function ibmvnic: remove duplicate napi_schedule call in open function ch_ktls: Fix kernel panic ch_ktls: fix device connection close ch_ktls: tcb close causes tls connection failure ch_ktls: do not send snd_una update to TCB in middle gro: ensure frag0 meets IP header alignment ARM: OMAP2+: Fix warning for omap_init_time_of() ARM: 9069/1: NOMMU: Fix conversion for_each_membock() to for_each_mem_range() ARM: footbridge: fix PCI interrupt mapping ARM: OMAP2+: Fix uninitialized sr_inst arm64: dts: allwinner: Fix SD card CD GPIO for SOPine systems arm64: dts: allwinner: h6: beelink-gs1: Remove ext. 32 kHz osc reference bpf: Use correct permission flag for mixed signed bounds arithmetic KVM: VMX: Convert vcpu_vmx.exit_reason to a union KVM: VMX: Don't use vcpu->run->internal.ndata as an array index r8169: tweak max read request size for newer chips also in jumbo mtu mode r8169: don't advertise pause in jumbo mode bpf: Ensure off_reg has no mixed signed bounds for all types bpf: Move off_reg into sanitize_ptr_alu ARM: 9071/1: uprobes: Don't hook on thumb instructions arm64: mte: Ensure TIF_MTE_ASYNC_FAULT is set atomically bpf: Rework ptr_limit into alu_limit and add common error path bpf: Improve verifier error messages for users bpf: Move sanitize_val_alu out of op switch net: phy: marvell: fix detection of PHY on Topaz switches Linux 5.10.32 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: If247bf8401509195e4f55f03dcc514f80d467966
158 lines
4.0 KiB
C
158 lines
4.0 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
|
|
#include <linux/pagewalk.h>
|
|
#include <linux/ptdump.h>
|
|
#include <linux/kasan.h>
|
|
|
|
#if defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS)
|
|
/*
|
|
* This is an optimization for KASAN=y case. Since all kasan page tables
|
|
* eventually point to the kasan_early_shadow_page we could call note_page()
|
|
* right away without walking through lower level page tables. This saves
|
|
* us dozens of seconds (minutes for 5-level config) while checking for
|
|
* W+X mapping or reading kernel_page_tables debugfs file.
|
|
*/
|
|
static inline int note_kasan_page_table(struct mm_walk *walk,
|
|
unsigned long addr)
|
|
{
|
|
struct ptdump_state *st = walk->private;
|
|
|
|
st->note_page(st, addr, 4, pte_val(kasan_early_shadow_pte[0]));
|
|
|
|
walk->action = ACTION_CONTINUE;
|
|
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
static int ptdump_pgd_entry(pgd_t *pgd, unsigned long addr,
|
|
unsigned long next, struct mm_walk *walk)
|
|
{
|
|
struct ptdump_state *st = walk->private;
|
|
pgd_t val = READ_ONCE(*pgd);
|
|
|
|
#if CONFIG_PGTABLE_LEVELS > 4 && \
|
|
(defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS))
|
|
if (pgd_page(val) == virt_to_page(lm_alias(kasan_early_shadow_p4d)))
|
|
return note_kasan_page_table(walk, addr);
|
|
#endif
|
|
|
|
if (st->effective_prot)
|
|
st->effective_prot(st, 0, pgd_val(val));
|
|
|
|
if (pgd_leaf(val))
|
|
st->note_page(st, addr, 0, pgd_val(val));
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int ptdump_p4d_entry(p4d_t *p4d, unsigned long addr,
|
|
unsigned long next, struct mm_walk *walk)
|
|
{
|
|
struct ptdump_state *st = walk->private;
|
|
p4d_t val = READ_ONCE(*p4d);
|
|
|
|
#if CONFIG_PGTABLE_LEVELS > 3 && \
|
|
(defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS))
|
|
if (p4d_page(val) == virt_to_page(lm_alias(kasan_early_shadow_pud)))
|
|
return note_kasan_page_table(walk, addr);
|
|
#endif
|
|
|
|
if (st->effective_prot)
|
|
st->effective_prot(st, 1, p4d_val(val));
|
|
|
|
if (p4d_leaf(val))
|
|
st->note_page(st, addr, 1, p4d_val(val));
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int ptdump_pud_entry(pud_t *pud, unsigned long addr,
|
|
unsigned long next, struct mm_walk *walk)
|
|
{
|
|
struct ptdump_state *st = walk->private;
|
|
pud_t val = READ_ONCE(*pud);
|
|
|
|
#if CONFIG_PGTABLE_LEVELS > 2 && \
|
|
(defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS))
|
|
if (pud_page(val) == virt_to_page(lm_alias(kasan_early_shadow_pmd)))
|
|
return note_kasan_page_table(walk, addr);
|
|
#endif
|
|
|
|
if (st->effective_prot)
|
|
st->effective_prot(st, 2, pud_val(val));
|
|
|
|
if (pud_leaf(val))
|
|
st->note_page(st, addr, 2, pud_val(val));
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int ptdump_pmd_entry(pmd_t *pmd, unsigned long addr,
|
|
unsigned long next, struct mm_walk *walk)
|
|
{
|
|
struct ptdump_state *st = walk->private;
|
|
pmd_t val = READ_ONCE(*pmd);
|
|
|
|
#if defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS)
|
|
if (pmd_page(val) == virt_to_page(lm_alias(kasan_early_shadow_pte)))
|
|
return note_kasan_page_table(walk, addr);
|
|
#endif
|
|
|
|
if (st->effective_prot)
|
|
st->effective_prot(st, 3, pmd_val(val));
|
|
if (pmd_leaf(val))
|
|
st->note_page(st, addr, 3, pmd_val(val));
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int ptdump_pte_entry(pte_t *pte, unsigned long addr,
|
|
unsigned long next, struct mm_walk *walk)
|
|
{
|
|
struct ptdump_state *st = walk->private;
|
|
pte_t val = ptep_get(pte);
|
|
|
|
if (st->effective_prot)
|
|
st->effective_prot(st, 4, pte_val(val));
|
|
|
|
st->note_page(st, addr, 4, pte_val(val));
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int ptdump_hole(unsigned long addr, unsigned long next,
|
|
int depth, struct mm_walk *walk)
|
|
{
|
|
struct ptdump_state *st = walk->private;
|
|
|
|
st->note_page(st, addr, depth, 0);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct mm_walk_ops ptdump_ops = {
|
|
.pgd_entry = ptdump_pgd_entry,
|
|
.p4d_entry = ptdump_p4d_entry,
|
|
.pud_entry = ptdump_pud_entry,
|
|
.pmd_entry = ptdump_pmd_entry,
|
|
.pte_entry = ptdump_pte_entry,
|
|
.pte_hole = ptdump_hole,
|
|
};
|
|
|
|
void ptdump_walk_pgd(struct ptdump_state *st, struct mm_struct *mm, pgd_t *pgd)
|
|
{
|
|
const struct ptdump_range *range = st->range;
|
|
|
|
mmap_read_lock(mm);
|
|
while (range->start != range->end) {
|
|
walk_page_range_novma(mm, range->start, range->end,
|
|
&ptdump_ops, pgd, st);
|
|
range++;
|
|
}
|
|
mmap_read_unlock(mm);
|
|
|
|
/* Flush out the last page */
|
|
st->note_page(st, 0, -1, 0);
|
|
}
|