https://source.android.com/docs/security/bulletin/2024-06-01 CVE-2024-26926 * tag 'ASB-2024-06-05_11-5.4' of https://android.googlesource.com/kernel/common: ANDROID: ABI fixup for abi break in struct dst_ops BACKPORT: net: fix __dst_negative_advice() race UPSTREAM: selftests: timers: Fix valid-adjtimex signed left-shift undefined behavior Revert "timers: Rename del_timer_sync() to timer_delete_sync()" Reapply "media: ttpci: fix two memleaks in budget_av_attach" Revert "media: rename VFL_TYPE_GRABBER to _VIDEO" Revert "media: media/pci: rename VFL_TYPE_GRABBER to _VIDEO" Revert "media: ttpci: fix two memleaks in budget_av_attach" Revert "net: ip_tunnel: make sure to pull inner header in ip_tunnel_rcv()" Revert "regmap: allow to define reg_update_bits for no bus configuration" Revert "regmap: Add bulk read/write callbacks into regmap_config" Revert "serial: max310x: fix IO data corruption in batched operations" Revert "geneve: make sure to pull inner header in geneve_rx()" Linux 5.4.274 firmware: meson_sm: fix to avoid potential NULL pointer dereference ip_gre: do not report erspan version on GRE interface erspan: Check IFLA_GRE_ERSPAN_VER is set. VMCI: Fix possible memcpy() run-time warning in vmci_datagram_invoke_guest_handler() Bluetooth: btintel: Fixe build regression x86/alternative: Don't call text_poke() in lazy TLB mode drm/i915/gt: Reset queue_priority_hint on parking x86/mm/pat: fix VM_PAT handling in COW mappings virtio: reenable config if freezing device failed drm/vkms: call drm_atomic_helper_shutdown before drm_dev_put() tty: n_gsm: require CAP_NET_ADMIN to attach N_GSM0710 ldisc netfilter: nf_tables: discard table flag update with pending basechain deletion netfilter: nf_tables: release mutex after nft_gc_seq_end from abort path netfilter: nf_tables: release batch on table validation from abort path netfilter: nf_tables: reject new basechain after table flag update fbmon: prevent division by zero in fb_videomode_from_videomode() fbdev: viafb: fix typo in hw_bitblt_1 and hw_bitblt_2 usb: sl811-hcd: only defined function checkdone if QUIRK2 is defined usb: typec: tcpci: add generic tcpci fallback compatible tools: iio: replace seekdir() in iio_generic_buffer ktest: force $buildonly = 1 for 'make_warnings_file' test type Input: allocate keycode for Display refresh rate toggle block: prevent division by zero in blk_rq_stat_sum() Revert "ACPI: PM: Block ASUS B1400CEAE from suspend to idle by default" SUNRPC: increase size of rpc_wait_queue.qlen from unsigned short to unsigned int drm/amd/display: Fix nanosec stat overflow media: sta2x11: fix irq handler cast isofs: handle CDs with bad root inode but good Joliet root directory scsi: lpfc: Fix possible memory leak in lpfc_rcv_padisc() sysv: don't call sb_bread() with pointers_lock held Input: synaptics-rmi4 - fail probing if memory allocation for "phys" fails Bluetooth: btintel: Fix null ptr deref in btintel_read_version btrfs: send: handle path ref underflow in header iterate_inode_ref() btrfs: export: handle invalid inode or root reference in btrfs_get_parent() btrfs: handle chunk tree lookup error in btrfs_relocate_sys_chunks() tools/power x86_energy_perf_policy: Fix file leak in get_pkg_num() ionic: set adminq irq affinity arm64: dts: rockchip: fix rk3399 hdmi ports node arm64: dts: rockchip: fix rk3328 hdmi ports node panic: Flush kernel log buffer at the end VMCI: Fix memcpy() run-time warning in dg_dispatch_as_host() wifi: ath9k: fix LNA selection in ath_ant_try_scan() s390/entry: align system call table on 8 bytes x86/mce: Make sure to grab mce_sysfs_mutex in set_bank() ALSA: hda/realtek: Update Panasonic CF-SZ6 quirk to support headset with microphone ata: sata_mv: Fix PCI device ID table declaration compilation warning scsi: mylex: Fix sysfs buffer lengths ata: sata_sx4: fix pdc20621_get_from_dimm() on 64-bit ASoC: ops: Fix wraparound for mask in snd_soc_get_volsw net: ravb: Always process TX descriptor ring erspan: make sure erspan_base_hdr is present in skb->head erspan: Add type I version 0 support. init: open /initrd.image with O_LARGEFILE initramfs: switch initramfs unpacking to struct file based APIs fs: add a vfs_fchmod helper fs: add a vfs_fchown helper staging: vc04_services: fix information leak in create_component() staging: vc04_services: changen strncpy() to strscpy_pad() staging: mmal-vchiq: Fix client_component for 64 bit kernel staging: mmal-vchiq: Allocate and free components as required i40e: fix vf may be used uninitialized in this function warning ipv6: Fix infinite recursion in fib6_dump_done(). selftests: reuseaddr_conflict: add missing new line at the end of the output net: stmmac: fix rx queue priority assignment net/sched: act_skbmod: prevent kernel-infoleak bpf, sockmap: Prevent lock inversion deadlock in map delete elem netfilter: nf_tables: Fix potential data-race in __nft_flowtable_type_get() netfilter: nf_tables: flush pending destroy work before exit_net release mm, vmscan: prevent infinite loop for costly GFP_NOIO | __GFP_RETRY_MAYFAIL allocations Revert "x86/mm/ident_map: Use gbpages only where full GB page should be mapped." vfio/platform: Create persistent IRQ handlers vfio/pci: Create persistent INTx handler vfio: Introduce interface to flush virqfd inject workqueue vfio/pci: Lock external INTx masking ops vfio/pci: Disable auto-enable of exclusive INTx IRQ net/rds: fix possible cp null dereference netfilter: nf_tables: disallow timeout for anonymous sets Bluetooth: Fix TOCTOU in HCI debugfs implementation Bluetooth: hci_event: set the conn encrypted before conn establishes x86/cpufeatures: Add new word for scattered features r8169: fix issue caused by buggy BIOS on certain boards with RTL8168d dm integrity: fix out-of-range warning tcp: properly terminate timers for kernel sockets ixgbe: avoid sleeping allocation in ixgbe_ipsec_vf_add_sa() nfc: nci: Fix uninit-value in nci_dev_up and nci_ntf_packet USB: core: Fix deadlock in usb_deauthorize_interface() scsi: lpfc: Correct size for wqe for memset() x86/cpu: Enable STIBP on AMD if Automatic IBRS is enabled scsi: qla2xxx: Fix command flush on cable pull usb: udc: remove warning when queue disabled ep usb: dwc2: gadget: LPM flow fix usb: dwc2: host: Fix ISOC flow in DDMA mode usb: dwc2: host: Fix hibernation flow usb: dwc2: host: Fix remote wakeup from hibernation scsi: core: Fix unremoved procfs host directory regression ALSA: sh: aica: reorder cleanup operations to avoid UAF bugs usb: cdc-wdm: close race between read and workqueue mmc: core: Avoid negative index with array access mmc: core: Initialize mmc_blk_ioc_data exec: Fix NOMMU linux_binprm::exec in transfer_args_to_stack() wifi: mac80211: check/clear fast rx for non-4addr sta VLAN changes mm/migrate: set swap entry values of THP tail pages properly. mm/memory-failure: fix an incorrect use of tail pages vt: fix memory overlapping when deleting chars in the buffer bounds: support non-power-of-two CONFIG_NR_CPUS powerpc: xor_vmx: Add '-mhard-float' to CFLAGS efivarfs: Request at most 512 bytes for variable names perf/core: Fix reentry problem in perf_output_read_group() loop: loop_set_status_from_info() check before assignment loop: Check for overflow while configuring loop loop: Factor out configuring loop from status loop: Refactor loop_set_status() size calculation loop: Factor out setting loop device size loop: Remove sector_t truncation checks loop: Call loop_config_discard() only after new config is applied Revert "loop: Check for overflow while configuring loop" btrfs: allocate btrfs_ioctl_defrag_range_args on stack printk: Update @console_may_schedule in console_trylock_spinning() xen/events: close evtchn after mapping cleanup x86/speculation: Support intra-function call validation objtool: Add support for intra-function calls objtool: is_fentry_call() crashes if call has no destination fs/aio: Check IOCB_AIO_RW before the struct aio_kiocb conversion vt: fix unicode buffer corruption when deleting characters tty: serial: fsl_lpuart: avoid idle preamble pending if CTS is enabled usb: port: Don't try to peer unused USB ports based on location usb: gadget: ncm: Fix handling of zero block length packets USB: usb-storage: Prevent divide-by-0 error in isd200_ata_command ALSA: hda/realtek - Fix headset Mic no show at resume back for Lenovo ALC897 platform xfrm: Avoid clang fortify warning in copy_to_user_tmpl() netfilter: nf_tables: reject constant set with timeout netfilter: nf_tables: disallow anonymous set with timeout flag netfilter: nf_tables: mark set as dead when unbinding anonymous set with timeout comedi: comedi_test: Prevent timers rescheduling during deletion dm snapshot: fix lockup in dm_exception_table_exit ahci: asm1064: asm1166: don't limit reported ports ahci: asm1064: correct count of reported ports x86/CPU/AMD: Update the Zenbleed microcode revisions nilfs2: prevent kernel bug at submit_bh_wbc() nilfs2: use a more common logging style nilfs2: fix failure to detect DAT corruption in btree and direct mappings memtest: use {READ,WRITE}_ONCE in memory scanning drm/vc4: hdmi: do not return negative values from .get_modes() drm/imx/ipuv3: do not return negative values from .get_modes() drm/exynos: do not return negative values from .get_modes() s390/zcrypt: fix reference counting on zcrypt card objects soc: fsl: qbman: Use raw spinlock for cgr_lock soc: fsl: qbman: Add CGR update function soc: fsl: qbman: Add helper for sanity checking cgr ops soc: fsl: qbman: Always disable interrupts when taking cgr_lock ring-buffer: Fix full_waiters_pending in poll ring-buffer: Fix resetting of shortest_full vfio/platform: Disable virqfds on cleanup kbuild: Move -Wenum-{compare-conditional,enum-conversion} into W=1 speakup: Fix 8bit characters from direct synth slimbus: core: Remove usage of the deprecated ida_simple_xx() API nvmem: meson-efuse: fix function pointer type mismatch firmware: meson_sm: Rework driver as a proper platform driver ext4: fix corruption during on-line resize hwmon: (amc6821) add of_match table mmc: core: Fix switch on gp3 partition dm-raid: fix lockdep waring in "pers->hot_add_disk" Revert "Revert "md/raid5: Wait for MD_SB_CHANGE_PENDING in raid5d"" PCI/PM: Drain runtime-idle callbacks before driver removal PCI: Drop pci_device_remove() test of pci_dev->driver btrfs: fix off-by-one chunk length calculation at contains_pending_extent() fuse: don't unhash root mmc: tmio: avoid concurrent runs of mmc_request_done() PM: sleep: wakeirq: fix wake irq warning in system suspend USB: serial: cp210x: add pid/vid for TDK NC0110013M and MM0110113M USB: serial: option: add MeiG Smart SLM320 product USB: serial: cp210x: add ID for MGP Instruments PDS100 USB: serial: add device ID for VeriFone adapter USB: serial: ftdi_sio: add support for GMC Z216C Adapter IR-USB powerpc/fsl: Fix mfpmr build errors with newer binutils clk: qcom: mmcc-msm8974: fix terminating of frequency table arrays clk: qcom: mmcc-apq8084: fix terminating of frequency table arrays clk: qcom: gcc-ipq8074: fix terminating of frequency table arrays PM: suspend: Set mem_sleep_current during kernel command line setup parisc: Strip upper 32 bit of sum in csum_ipv6_magic for 64-bit builds parisc: Fix csum_ipv6_magic on 64-bit systems parisc: Fix csum_ipv6_magic on 32-bit systems parisc: Fix ip_fast_csum parisc: Do not hardcode registers in checksum functions mtd: rawnand: meson: fix scrambling mode value in command macro ubi: correct the calculation of fastmap size ubi: Check for too small LEB size in VTBL code ubifs: Set page uptodate in the correct place fat: fix uninitialized field in nostale filehandles ext4: correct best extent lstart adjustment logic selftests/mqueue: Set timeout to 180 seconds crypto: qat - resolve race condition during AER recovery crypto: qat - fix double free during reset sparc: vDSO: fix return value of __setup handler sparc64: NMI watchdog: fix return value of __setup handler KVM: Always flush async #PF workqueue when vCPU is being destroyed media: xc4000: Fix atomicity violation in xc4000_get_frequency serial: max310x: fix NULL pointer dereference in I2C instantiation arm: dts: marvell: Fix maxium->maxim typo in brownstone dts ARM: dts: mmp2-brownstone: Don't redeclare phandle references smack: Handle SMACK64TRANSMUTE in smack_inode_setsecurity() smack: Set SMACK64TRANSMUTE only for dirs in smack_inode_setxattr() clk: qcom: gcc-sdm845: Add soft dependency on rpmhpd media: staging: ipu3-imgu: Set fields before media_entity_pads_init() wifi: brcmfmac: Fix use-after-free bug in brcmf_cfg80211_detach timers: Rename del_timer_sync() to timer_delete_sync() timers: Use del_timer_sync() even on UP timers: Update kernel-doc for various functions x86/bugs: Use sysfs_emit() x86/cpu: Support AMD Automatic IBRS Documentation/hw-vuln: Update spectre doc amdkfd: use calloc instead of kzalloc to avoid integer overflow Linux 5.4.273 regmap: Add missing map->bus check spi: spi-mt65xx: Fix NULL pointer access in interrupt handler bpf: report RCU QS in cpumap kthread rcu: add a helper to report consolidated flavor QS netfilter: nf_tables: do not compare internal table flags on updates ARM: dts: sun8i-h2-plus-bananapi-m2-zero: add regulator nodes vcc-dram and vcc1v2 octeontx2-af: Use separate handlers for interrupts net/bnx2x: Prevent access to a freed page in page_pool hsr: Handle failures in module init rds: introduce acquire/release ordering in acquire/release_in_xmit() packet: annotate data-races around ignore_outgoing hsr: Fix uninit-value access in hsr_get_node() s390/vtime: fix average steal time calculation octeontx2-af: Use matching wake_up API variant in CGX command interface usb: gadget: net2272: Use irqflags in the call to net2272_probe_fin staging: greybus: fix get_channel_from_mode() failure path serial: 8250_exar: Don't remove GPIO device on suspend rtc: mt6397: select IRQ_DOMAIN instead of depending on it kconfig: fix infinite loop when expanding a macro at the end of file tty: serial: samsung: fix tx_empty() to return TIOCSER_TEMT serial: max310x: fix syntax error in IRQ error message tty: vt: fix 20 vs 0x20 typo in EScsiignore afs: Revert "afs: Hide silly-rename files from userspace" NFS: Fix an off by one in root_nfs_cat() watchdog: stm32_iwdg: initialize default timeout net: sunrpc: Fix an off by one in rpc_sockaddr2uaddr() scsi: bfa: Fix function pointer type mismatch for hcb_qe->cbfn RDMA/device: Fix a race between mad_client and cm_client init scsi: csiostor: Avoid function pointer casts ALSA: usb-audio: Stop parsing channels bits when all channels are found. clk: Fix clk_core_get NULL dereference sparc32: Fix section mismatch in leon_pci_grpci backlight: lp8788: Fully initialize backlight_properties during probe backlight: lm3639: Fully initialize backlight_properties during probe backlight: da9052: Fully initialize backlight_properties during probe backlight: lm3630a: Don't set bl->props.brightness in get_brightness backlight: lm3630a: Initialize backlight_properties on init powerpc/embedded6xx: Fix no previous prototype for avr_uart_send() etc. drm/msm/dpu: add division of drm_display_mode's hskew parameter powerpc/hv-gpci: Fix the H_GET_PERF_COUNTER_INFO hcall return value checks drm/mediatek: Fix a null pointer crash in mtk_drm_crtc_finish_page_flip media: ttpci: fix two memleaks in budget_av_attach media: media/pci: rename VFL_TYPE_GRABBER to _VIDEO media: rename VFL_TYPE_GRABBER to _VIDEO media: v4l2-core: correctly validate video and metadata ioctls media: go7007: fix a memleak in go7007_load_encoder media: dvb-frontends: avoid stack overflow warnings with clang media: pvrusb2: fix uaf in pvr2_context_set_notify drm/amdgpu: Fix missing break in ATOM_ARG_IMM Case of atom_get_src_int() ASoC: meson: axg-tdm-interface: fix mclk setup without mclk-fs mtd: rawnand: lpc32xx_mlc: fix irq handler prototype mtd: maps: physmap-core: fix flash size larger than 32-bit crypto: arm/sha - fix function cast warnings mfd: altera-sysmgr: Call of_node_put() only when of_parse_phandle() takes a ref mfd: syscon: Call of_node_put() only when of_parse_phandle() takes a ref drm/tegra: put drm_gem_object ref on error in tegra_fb_create clk: hisilicon: hi3519: Release the correct number of gates in hi3519_clk_unregister() PCI: Mark 3ware-9650SE Root Port Extended Tags as broken drm/mediatek: dsi: Fix DSI RGB666 formats and definitions clk: qcom: dispcc-sdm845: Adjust internal GDSC wait times media: pvrusb2: fix pvr2_stream_callback casts media: pvrusb2: remove redundant NULL check media: go7007: add check of return value of go7007_read_addr() media: imx: csc/scaler: fix v4l2_ctrl_handler memory leak perf stat: Avoid metric-only segv ALSA: seq: fix function cast warnings drm/radeon/ni: Fix wrong firmware size logging in ni_init_microcode() perf thread_map: Free strlist on normal path in thread_map__new_by_tid_str() PCI: switchtec: Fix an error handling path in switchtec_pci_probe() quota: Fix rcu annotations of inode dquot pointers quota: Fix potential NULL pointer dereference quota: simplify drop_dquot_ref() clk: qcom: reset: Ensure write completion on reset de/assertion clk: qcom: reset: Commonize the de/assert functions clk: qcom: reset: support resetting multiple bits clk: qcom: reset: Allow specifying custom reset delay media: edia: dvbdev: fix a use-after-free media: v4l2-mem2mem: fix a memleak in v4l2_m2m_register_entity media: v4l2-tpg: fix some memleaks in tpg_alloc media: em28xx: annotate unchecked call to media_device_register() perf evsel: Fix duplicate initialization of data->id in evsel__parse_sample() drm/amd/display: Fix potential NULL pointer dereferences in 'dcn10_set_output_transfer_func()' perf record: Fix possible incorrect free in record__switch_output() PCI/DPC: Print all TLP Prefixes, not just the first media: tc358743: register v4l2 async device only after successful setup dmaengine: tegra210-adma: Update dependency to ARCH_TEGRA drm/rockchip: lvds: do not overwrite error code drm: Don't treat 0 as -1 in drm_fixp2int_ceil drm/rockchip: inno_hdmi: Fix video timing drm/tegra: output: Fix missing i2c_put_adapter() in the error handling paths of tegra_output_probe() drm/tegra: dsi: Fix missing pm_runtime_disable() in the error handling path of tegra_dsi_probe() drm/tegra: dsi: Fix some error handling paths in tegra_dsi_probe() drm/tegra: dsi: Make use of the helper function dev_err_probe() gpu: host1x: mipi: Update tegra_mipi_request() to be node based drm/tegra: dsi: Add missing check for of_find_device_by_node dm: call the resume method on internal suspend dm raid: fix false positive for requeue needed during reshape nfp: flower: handle acti_netdevs allocation failure net/x25: fix incorrect parameter validation in the x25_getsockopt() function net: kcm: fix incorrect parameter validation in the kcm_getsockopt) function udp: fix incorrect parameter validation in the udp_lib_getsockopt() function l2tp: fix incorrect parameter validation in the pppol2tp_getsockopt() function tcp: fix incorrect parameter validation in the do_tcp_getsockopt() function net: hns3: fix port duplex configure error in IMP reset net: ip_tunnel: make sure to pull inner header in ip_tunnel_rcv() ipv6: fib6_rules: flush route cache when rule is changed bpf: Fix stackmap overflow check on 32-bit arches bpf: Fix hashtab overflow check on 32-bit arches sr9800: Add check for usbnet_get_endpoints Bluetooth: hci_core: Fix possible buffer overflow Bluetooth: Remove superfluous call to hci_conn_check_pending() igb: Fix missing time sync events igb: move PEROUT and EXTTS isr logic to separate functions mmc: wmt-sdmmc: remove an incorrect release_mem_region() call in the .remove function SUNRPC: fix some memleaks in gssx_dec_option_array x86, relocs: Ignore relocations in .notes section ACPI: scan: Fix device check notification handling ARM: dts: imx6dl-yapp4: Move the internal switch PHYs under the switch node ARM: dts: imx6dl-yapp4: Fix typo in the QCA switch register address ARM: dts: imx6dl-yapp4: Move phy reset into switch node ARM: dts: arm: realview: Fix development chip ROM compatible value net: ena: Remove ena_select_queue net: ena: cosmetic: fix line break issues wifi: brcmsmac: avoid function pointer casts iommu/amd: Mark interrupt as managed bus: tegra-aconnect: Update dependency to ARCH_TEGRA ACPI: processor_idle: Fix memory leak in acpi_processor_power_exit() arm64: dts: qcom: msm8996: Pad addresses arm64: dts: qcom: msm8996: Move regulator consumers to db820c arm64: dts: qcom: msm8996: Use node references in db820c arm64: dts: qcom: db820c: Move non-soc entries out of /soc bpf: Mark bpf_spin_{lock,unlock}() helpers with notrace correctly bpf: Factor out bpf_spin_lock into helpers. bpf: Add typecast to bpf helpers to help BTF generation arm64: dts: mediatek: mt7622: add missing "device_type" to memory nodes wifi: libertas: fix some memleaks in lbs_allocate_cmd_buffer() net: blackhole_dev: fix build warning for ethh set but not used af_unix: Annotate data-race of gc_in_progress in wait_for_unix_gc(). sock_diag: annotate data-races around sock_diag_handlers[family] wifi: mwifiex: debugfs: Drop unnecessary error check for debugfs_create_dir() wifi: wilc1000: fix RCU usage in connect path wifi: wilc1000: fix declarations ordering wifi: b43: Disable QoS for bcm4331 wifi: b43: Stop correct queue in DMA worker when QoS is disabled b43: main: Fix use true/false for bool type wifi: b43: Stop/wake correct queue in PIO Tx path when QoS is disabled wifi: b43: Stop/wake correct queue in DMA Tx path when QoS is disabled b43: dma: Fix use true/false for bool type variable wifi: ath10k: fix NULL pointer dereference in ath10k_wmi_tlv_op_pull_mgmt_tx_compl_ev() timekeeping: Fix cross-timestamp interpolation for non-x86 timekeeping: Fix cross-timestamp interpolation corner case decision timekeeping: Fix cross-timestamp interpolation on counter wrap aoe: fix the potential use-after-free problem in aoecmd_cfg_pkts fs/select: rework stack allocation hack for clang nbd: null check for nla_nest_start do_sys_name_to_handle(): use kzalloc() to fix kernel-infoleak ASoC: wm8962: Fix up incorrect error message in wm8962_set_fll ASoC: wm8962: Enable both SPKOUTR_ENA and SPKOUTL_ENA in mono mode ASoC: wm8962: Enable oscillator if selecting WM8962_FLL_OSC Input: gpio_keys_polled - suppress deferred probe error for gpio ASoC: Intel: bytcr_rt5640: Add an extra entry for the Chuwi Vi8 tablet firewire: core: use long bus reset on gap count error Bluetooth: rfcomm: Fix null-ptr-deref in rfcomm_check_security scsi: mpt3sas: Prevent sending diag_reset when the controller is ready btrfs: fix data race at btrfs_use_block_rsv() when accessing block reserve dm-verity, dm-crypt: align "struct bvec_iter" correctly block: sed-opal: handle empty atoms when parsing response parisc/ftrace: add missing CONFIG_DYNAMIC_FTRACE check net/iucv: fix the allocation size of iucv_path_table array RDMA/mlx5: Relax DEVX access upon modify commands HID: multitouch: Add required quirk for Synaptics 0xcddc device MIPS: Clear Cause.BD in instruction_pointer_set x86/xen: Add some null pointer checking to smp.c ASoC: rt5645: Make LattePanda board DMI match more precise selftests: tls: use exact comparison in recv_partial io_uring: drop any code related to SCM_RIGHTS io_uring/unix: drop usage of io_uring socket UPSTREAM: arm64: dts: qcom: sdm845: fix USB DP/DM HS PHY interrupts UPSTREAM: arm64: dts: qcom: add PDC interrupt controller for SDM845 Linux 5.4.272 arm64: dts: qcom: sdm845: fix USB DP/DM HS PHY interrupts arm64: dts: qcom: add PDC interrupt controller for SDM845 serial: max310x: fix IO data corruption in batched operations serial: max310x: implement I2C support serial: max310x: make accessing revision id interface-agnostic regmap: Add bulk read/write callbacks into regmap_config regmap: allow to define reg_update_bits for no bus configuration serial: max310x: Unprepare and disable clock in error path getrusage: use sig->stats_lock rather than lock_task_sighand() getrusage: use __for_each_thread() getrusage: move thread_group_cputime_adjusted() outside of lock_task_sighand() getrusage: add the "signal_struct *sig" local variable y2038: rusage: use __kernel_old_timeval hv_netvsc: Register VF in netvsc_probe if NET_DEVICE_REGISTER missed hv_netvsc: use netif_is_bond_master() instead of open code hv_netvsc: Make netvsc/VF binding check both MAC and serial number Input: i8042 - fix strange behavior of touchpad on Clevo NS70PU serial: max310x: prevent infinite while() loop in port startup serial: max310x: use a separate regmap for each port serial: max310x: use regmap methods for SPI batch operations serial: max310x: Make use of device properties serial: max310x: fail probe if clock crystal is unstable serial: max310x: Try to get crystal clock rate from property serial: max310x: Use devm_clk_get_optional() to get the input clock um: allow not setting extra rpaths in the linux binary selftests: mm: fix map_hugetlb failure on 64K page size systems netrom: Fix data-races around sysctl_net_busy_read netrom: Fix a data-race around sysctl_netrom_link_fails_count netrom: Fix a data-race around sysctl_netrom_routing_control netrom: Fix a data-race around sysctl_netrom_transport_no_activity_timeout netrom: Fix a data-race around sysctl_netrom_transport_requested_window_size netrom: Fix a data-race around sysctl_netrom_transport_busy_delay netrom: Fix a data-race around sysctl_netrom_transport_acknowledge_delay netrom: Fix a data-race around sysctl_netrom_transport_maximum_tries netrom: Fix a data-race around sysctl_netrom_transport_timeout netrom: Fix data-races around sysctl_netrom_network_ttl_initialiser netrom: Fix a data-race around sysctl_netrom_obsolescence_count_initialiser netrom: Fix a data-race around sysctl_netrom_default_path_quality netfilter: nf_conntrack_h323: Add protection for bmp length out of range netfilter: nft_ct: fix l3num expectations with inet pseudo family net/rds: fix WARNING in rds_conn_connect_if_down net/ipv6: avoid possible UAF in ip6_route_mpath_notify() net: ice: Fix potential NULL pointer dereference in ice_bridge_setlink() geneve: make sure to pull inner header in geneve_rx() ixgbe: {dis, en}able irqs in ixgbe_txrx_ring_{dis, en}able net: lan78xx: fix runtime PM count underflow on link stop lan78xx: Fix race conditions in suspend/resume handling lan78xx: Fix partial packet errors on suspend/resume lan78xx: Add missing return code checks lan78xx: Fix white space and style issues Linux 5.4.271 gpio: 74x164: Enable output pins after registers are reset fs,hugetlb: fix NULL pointer dereference in hugetlbs_fill_super cachefiles: fix memory leak in cachefiles_add_cache() x86/cpu/intel: Detect TME keyid bits before setting MTRR mask registers mmc: core: Fix eMMC initialization with 1-bit bus connection dmaengine: fsl-qdma: init irq after reg initialization dmaengine: fsl-qdma: fix SoC may hang on 16 byte unaligned read btrfs: dev-replace: properly validate device names wifi: nl80211: reject iftype change with mesh ID change gtp: fix use-after-free and null-ptr-deref in gtp_newlink() afs: Fix endless loop in directory parsing ALSA: Drop leftover snd-rtctimer stuff from Makefile power: supply: bq27xxx-i2c: Do not free non existing IRQ efi/capsule-loader: fix incorrect allocation size rtnetlink: fix error logic of IFLA_BRIDGE_FLAGS writing back netfilter: nf_tables: allow NFPROTO_INET in nft_(match/target)_validate() Bluetooth: Enforce validation on max value of connection interval Bluetooth: hci_event: Fix handling of HCI_EV_IO_CAPA_REQUEST Bluetooth: Avoid potential use-after-free in hci_error_reset net: usb: dm9601: fix wrong return value in dm9601_mdio_read lan78xx: enable auto speed configuration for LAN7850 if no EEPROM is detected ipv6: fix potential "struct net" leak in inet6_rtm_getaddr() tun: Fix xdp_rxq_info's queue_index when detaching net: ip_tunnel: prevent perpetual headroom growth netlink: Fix kernel-infoleak-after-free in __skb_datagram_iter ANDROID: GKI: update .xml file due to USB changes in 5.4.270 Revert "bpf: Add map and need_defer parameters to .map_fd_put_ptr()" Revert "hrtimer: Report offline hrtimer enqueue" Revert "drm/mipi-dsi: Fix detach call without attach" Linux 5.4.270 scripts/bpf: Fix xdp_md forward declaration typo fs/aio: Restrict kiocb_set_cancel_fn() to I/O submitted via libaio drm/syncobj: call drm_syncobj_fence_add_wait when WAIT_AVAILABLE flag is set drm/syncobj: make lockdep complain on WAIT_FOR_SUBMIT v3 netfilter: nf_tables: set dormant flag on hook register failure tls: stop recv() if initial process_rx_list gave us non-DATA tls: rx: drop pointless else after goto tls: rx: jump to a more appropriate label s390: use the correct count for __iowrite64_copy() packet: move from strlcpy with unused retval to strscpy ipv6: sr: fix possible use-after-free and null-ptr-deref afs: Increase buffer size in afs_update_volume_status() ipv6: properly combine dev_base_seq and ipv6.dev_addr_genid ipv4: properly combine dev_base_seq and ipv4.dev_addr_genid nouveau: fix function cast warnings scsi: jazz_esp: Only build if SCSI core is builtin bpf, scripts: Correct GPL license name scripts/bpf: teach bpf_helpers_doc.py to dump BPF helper definitions RDMA/srpt: fix function pointer cast warnings RDMA/srpt: Make debug output more detailed RDMA/bnxt_re: Return error for SRQ resize IB/hfi1: Fix a memleak in init_credit_return usb: roles: don't get/set_role() when usb_role_switch is unregistered usb: gadget: ncm: Avoid dropping datagrams of properly parsed NTBs usb: cdns3: fix memory double free when handle zero packet usb: cdns3: fixed memory use after free at cdns3_gadget_ep_disable() ARM: ep93xx: Add terminator to gpiod_lookup_table l2tp: pass correct message length to ip6_append_data PCI/MSI: Prevent MSI hardware interrupt number truncation gtp: fix use-after-free and null-ptr-deref in gtp_genl_dump_pdp() dm-crypt: don't modify the data when using authenticated encryption IB/hfi1: Fix sdma.h tx->num_descs off-by-one error PCI: tegra: Fix OF node reference leak PCI: tegra: Fix reporting GPIO error value arm64: dts: qcom: msm8916: Fix typo in pronto remoteproc node drm/amdgpu: Fix type of second parameter in trans_msg() callback iomap: Set all uptodate bits for an Uptodate page dm-integrity: don't modify bio's immutable bio_vec in integrity_metadata() x86/alternatives: Disable KASAN in apply_alternatives() drm/amdgpu: Check for valid number of registers to read Revert "drm/sun4i: dsi: Change the start delay calculation" ALSA: hda/realtek - Enable micmute LED on and HP system selftests/bpf: Avoid running unprivileged tests with alignment requirements net: bridge: clear bridge's private skb space on xmit spi: mt7621: Fix an error message in mt7621_spi_probe() pinctrl: rockchip: Fix refcount leak in rockchip_pinctrl_parse_groups pinctrl: pinctrl-rockchip: Fix a bunch of kerneldoc misdemeanours tcp: add annotations around sk->sk_shutdown accesses tcp: return EPOLLOUT from tcp_poll only when notsent_bytes is half the limit tcp: factor out __tcp_close() helper pmdomain: renesas: r8a77980-sysc: CR7 must be always on s390/qeth: Fix potential loss of L3-IP@ in case of network issues virtio-blk: Ensure no requests in virtqueues before deleting vqs. firewire: core: send bus reset promptly on gap count error scsi: lpfc: Use unsigned type for num_sge hwmon: (coretemp) Enlarge per package core count limit nvmet-fc: abort command when there is no binding netfilter: conntrack: check SCTP_CID_SHUTDOWN_ACK for vtag setting in sctp_new ASoC: sunxi: sun4i-spdif: Add support for Allwinner H616 nvmet-tcp: fix nvme tcp ida memory leak regulator: pwm-regulator: Add validity checks in continuous .get_voltage ext4: avoid allocating blocks from corrupted group in ext4_mb_find_by_goal() ext4: avoid allocating blocks from corrupted group in ext4_mb_try_best_found() ahci: add 43-bit DMA address quirk for ASMedia ASM1061 controllers ahci: asm1166: correct count of reported ports fbdev: sis: Error out if pixclock equals zero fbdev: savage: Error out if pixclock equals zero wifi: mac80211: fix race condition on enabling fast-xmit wifi: cfg80211: fix missing interfaces when dumping dmaengine: fsl-qdma: increase size of 'irq_name' dmaengine: shdma: increase size of 'dev_id' scsi: target: core: Add TMF to tmr_list handling sched/rt: Disallow writing invalid values to sched_rt_period_us sched/rt: Fix sysctl_sched_rr_timeslice intial value userfaultfd: fix mmap_changing checking in mfill_atomic_hugetlb nilfs2: replace WARN_ONs for invalid DAT metadata block requests memcg: add refcnt for pcpu stock to avoid UAF problem in drain_all_stock() sched/rt: sysctl_sched_rr_timeslice show default timeslice after reset net/sched: Retire dsmark qdisc net/sched: Retire ATM qdisc net/sched: Retire CBQ qdisc KVM: arm64: vgic-its: Test for valid IRQ in MOVALL handler KVM: arm64: vgic-its: Test for valid IRQ in its_sync_lpi_pending_table() Linux 5.4.269 of: gpio unittest kfree() wrong object of: unittest: fix EXPECT text for gpio hog errors net: bcmgenet: Fix EEE implementation Revert "Revert "mtd: rawnand: gpmi: Fix setting busy timeout setting"" netfilter: nf_tables: fix pointer math issue in nft_byteorder_eval() lsm: new security_file_ioctl_compat() hook drm/msm/dsi: Enable runtime PM PM: runtime: Have devm_pm_runtime_enable() handle pm_runtime_dont_use_autosuspend() PM: runtime: add devm_pm_runtime_enable helper nilfs2: fix potential bug in end_buffer_async_write sched/membarrier: reduce the ability to hammer on sys_membarrier net: prevent mss overflow in skb_segment() netfilter: ipset: Missing gc cancellations fixed netfilter: ipset: fix performance regression in swap operation KVM: arm64: vgic-its: Avoid potential UAF in LPI translation cache mips: Fix max_mapnr being uninitialized on early stages arch, mm: remove stale mentions of DISCONIGMEM bus: moxtet: Add spi device table Revert "md/raid5: Wait for MD_SB_CHANGE_PENDING in raid5d" tracing: Inform kmemleak of saved_cmdlines allocation pmdomain: core: Move the unused cleanup to a _sync initcall can: j1939: Fix UAF in j1939_sk_match_filter during setsockopt(SO_J1939_FILTER) irqchip/irq-brcmstb-l2: Add write memory barrier before exit nfp: flower: prevent re-adding mac index for bonded port nfp: use correct macro for LengthSelect in BAR config nilfs2: fix hang in nilfs_lookup_dirty_data_buffers() nilfs2: fix data corruption in dsync block recovery for small block sizes ALSA: hda/conexant: Add quirk for SWS JS201D mmc: slot-gpio: Allow non-sleeping GPIO ro x86/mm/ident_map: Use gbpages only where full GB page should be mapped. x86/Kconfig: Transmeta Crusoe is CPU family 5, not 6 serial: max310x: improve crystal stable clock detection serial: max310x: set default value when reading clock ready bit ring-buffer: Clean ring_buffer_poll_wait() error return iio: magnetometer: rm3100: add boundary check for the value read from RM3100_REG_TMRC staging: iio: ad5933: fix type mismatch regression tracing: Fix wasted memory in saved_cmdlines logic ext4: fix double-free of blocks due to wrong extents moved_len misc: fastrpc: Mark all sessions as invalid in cb_remove binder: signal epoll threads of self-work ALSA: hda/realtek: Enable headset mic on Vaio VJFE-ADL xen-netback: properly sync TX responses nfc: nci: free rx_data_reassembly skb on NCI device cleanup kbuild: Fix changing ELF file type for output of gen_btf for big endian firewire: core: correct documentation of fw_csr_string() kernel API scsi: Revert "scsi: fcoe: Fix potential deadlock on &fip->ctlr_lock" i2c: i801: Fix block process call transactions i2c: i801: Remove i801_set_block_buffer_mode usb: f_mass_storage: forbid async queue when shutdown happen USB: hub: check for alternate port before enabling A_ALT_HNP_SUPPORT HID: wacom: Do not register input devices until after hid_hw_start HID: wacom: generic: Avoid reporting a serial of '0' to userspace mm/writeback: fix possible divide-by-zero in wb_dirty_limits(), again tracing/trigger: Fix to return error if failed to alloc snapshot i40e: Fix waiting for queues of all VSIs to be disabled MIPS: Add 'memory' clobber to csum_ipv6_magic() inline assembler ASoC: rt5645: Fix deadlock in rt5645_jack_detect_work() spi: ppc4xx: Drop write-only variable of: unittest: Fix compile in the non-dynamic case of: unittest: add overlay gpio test to catch gpio hog problem btrfs: send: return EOPNOTSUPP on unknown flags btrfs: forbid deleting live subvol qgroup btrfs: forbid creating subvol qgroups netfilter: nft_set_rbtree: skip end interval element from gc net: stmmac: xgmac: fix a typo of register name in DPP safety handling net: stmmac: xgmac: use #define for string constants vhost: use kzalloc() instead of kmalloc() followed by memset() Input: atkbd - skip ATKBD_CMD_SETLEDS when skipping ATKBD_CMD_GETID hrtimer: Report offline hrtimer enqueue USB: serial: cp210x: add ID for IMST iM871A-USB USB: serial: option: add Fibocom FM101-GL variant USB: serial: qcserial: add new usb-id for Dell Wireless DW5826e net/af_iucv: clean up a try_then_request_module() netfilter: nft_ct: reject direction for ct id netfilter: nft_compat: restrict match/target protocol to u16 netfilter: nft_compat: reject unused compat flag ppp_async: limit MRU to 64K tipc: Check the bearer type before calling tipc_udp_nl_bearer_add() rxrpc: Fix response to PING RESPONSE ACKs to a dead call inet: read sk->sk_family once in inet_recv_error() hwmon: (coretemp) Fix bogus core_id to attr name mapping hwmon: (coretemp) Fix out-of-bounds memory access hwmon: (aspeed-pwm-tacho) mutex for tach reading atm: idt77252: fix a memleak in open_card_ubr0 selftests: net: avoid just another constant wait net: stmmac: xgmac: fix handling of DPP safety error for DMA channels phy: ti: phy-omap-usb2: Fix NULL pointer dereference for SRP dmaengine: fix is_slave_direction() return false when DMA_DEV_TO_DEV phy: renesas: rcar-gen3-usb2: Fix returning wrong error code dmaengine: fsl-qdma: Fix a memory leak related to the queue command DMA dmaengine: fsl-qdma: Fix a memory leak related to the status queue DMA bonding: remove print in bond_verify_device_path HID: apple: Add 2021 magic keyboard FN key mapping HID: apple: Swap the Fn and Left Control keys on Apple keyboards HID: apple: Add support for the 2021 Magic Keyboard net: sysfs: Fix /sys/class/net/<iface> path af_unix: fix lockdep positive in sk_diag_dump_icons() net: ipv4: fix a memleak in ip_setup_cork netfilter: nft_ct: sanitize layer 3 and 4 protocol number in custom expectations netfilter: nf_log: replace BUG_ON by WARN_ON_ONCE when putting logger llc: call sock_orphan() at release time ipv6: Ensure natural alignment of const ipv6 loopback and router addresses ixgbe: Fix an error handling path in ixgbe_read_iosf_sb_reg_x550() ixgbe: Refactor overtemp event handling ixgbe: Refactor returning internal error codes ixgbe: Remove non-inclusive language net: remove unneeded break scsi: isci: Fix an error code problem in isci_io_request_build() wifi: cfg80211: fix RCU dereference in __cfg80211_bss_update perf: Fix the nr_addr_filters fix drm/amdgpu: Release 'adev->pm.fw' before return in 'amdgpu_device_need_post()' ceph: fix deadlock or deadcode of misusing dget() blk-mq: fix IO hang from sbitmap wakeup race virtio_net: Fix "‘%d’ directive writing between 1 and 11 bytes into a region of size 10" warnings libsubcmd: Fix memory leak in uniq() PCI/AER: Decode Requester ID when no error info found fs/kernfs/dir: obey S_ISGID usb: hub: Replace hardcoded quirk value with BIT() macro PCI: switchtec: Fix stdev_release() crash after surprise hot remove PCI: Only override AMD USB controller if required mfd: ti_am335x_tscadc: Fix TI SoC dependencies i3c: master: cdns: Update maximum prescaler value for i2c clock um: net: Fix return type of uml_net_start_xmit() um: Don't use vfprintf() for os_info() um: Fix naming clash between UML and scheduler leds: trigger: panic: Don't register panic notifier if creating the trigger failed drm/amdgpu: Drop 'fence' check in 'to_amdgpu_amdkfd_fence()' drm/amdgpu: Let KFD sync with VM fences clk: mmp: pxa168: Fix memory leak in pxa168_clk_init() clk: hi3620: Fix memory leak in hi3620_mmc_clk_init() drm/msm/dpu: Ratelimit framedone timeout msgs media: ddbridge: fix an error code problem in ddb_probe IB/ipoib: Fix mcast list locking drm/exynos: Call drm_atomic_helper_shutdown() at shutdown/unbind time ALSA: hda: Intel: add HDA_ARL PCI ID support PCI: add INTEL_HDA_ARL to pci_ids.h media: rockchip: rga: fix swizzling for RGB formats media: stk1160: Fixed high volume of stk1160_dbg messages drm/mipi-dsi: Fix detach call without attach drm/framebuffer: Fix use of uninitialized variable drm/drm_file: fix use of uninitialized variable RDMA/IPoIB: Fix error code return in ipoib_mcast_join fast_dput(): handle underflows gracefully ASoC: doc: Fix undefined SND_SOC_DAPM_NOPM argument f2fs: fix to check return value of f2fs_reserve_new_block() wifi: cfg80211: free beacon_ies when overridden from hidden BSS wifi: rtlwifi: rtl8723{be,ae}: using calculate_bit_shift() wifi: rtl8xxxu: Add additional USB IDs for RTL8192EU devices arm64: dts: qcom: msm8998: Fix 'out-ports' is a required property arm64: dts: qcom: msm8996: Fix 'in-ports' is a required property md: Whenassemble the array, consult the superblock of the freshest device block: prevent an integer overflow in bvec_try_merge_hw_page ARM: dts: imx23/28: Fix the DMA controller node name ARM: dts: imx23-sansa: Use preferred i2c-gpios properties ARM: dts: imx27-apf27dev: Fix LED name ARM: dts: imx25/27: Pass timing0 ARM: dts: imx1: Fix sram node ARM: dts: imx27: Fix sram node ARM: dts: imx: Use flash@0,0 pattern ARM: dts: imx25/27-eukrea: Fix RTC node name ARM: dts: rockchip: fix rk3036 hdmi ports node scsi: libfc: Fix up timeout error in fc_fcp_rec_error() scsi: libfc: Don't schedule abort twice bpf: Add map and need_defer parameters to .map_fd_put_ptr() wifi: ath9k: Fix potential array-index-out-of-bounds read in ath9k_htc_txstatus() ARM: dts: imx7s: Fix nand-controller #size-cells ARM: dts: imx7s: Fix lcdif compatible ARM: dts: imx7d: Fix coresight funnel ports bonding: return -ENOMEM instead of BUG in alb_upper_dev_walk PCI: Add no PM reset quirk for NVIDIA Spectrum devices scsi: lpfc: Fix possible file string name overflow when updating firmware selftests/bpf: Fix pyperf180 compilation failure with clang18 selftests/bpf: satisfy compiler by having explicit return in btf test wifi: rt2x00: restart beacon queue when hardware reset ext4: avoid online resizing failures due to oversized flex bg ext4: remove unnecessary check from alloc_flex_gd() ext4: unify the type of flexbg_size to unsigned int ext4: fix inconsistent between segment fstrim and full fstrim ecryptfs: Reject casefold directory inodes SUNRPC: Fix a suspicious RCU usage warning KVM: s390: fix setting of fpc register s390/ptrace: handle setting of fpc register correctly jfs: fix array-index-out-of-bounds in diNewExt rxrpc_find_service_conn_rcu: fix the usage of read_seqbegin_or_lock() afs: fix the usage of read_seqbegin_or_lock() in afs_find_server*() crypto: stm32/crc32 - fix parsing list of devices pstore/ram: Fix crash when setting number of cpus to an odd number jfs: fix uaf in jfs_evict_inode jfs: fix array-index-out-of-bounds in dbAdjTree jfs: fix slab-out-of-bounds Read in dtSearch UBSAN: array-index-out-of-bounds in dtSplitRoot FS:JFS:UBSAN:array-index-out-of-bounds in dbAdjTree ACPI: extlog: fix NULL pointer dereference check PNP: ACPI: fix fortify warning ACPI: video: Add quirk for the Colorful X15 AT 23 Laptop audit: Send netlink ACK before setting connection in auditd_set regulator: core: Only increment use_count when enable_count changes perf/core: Fix narrow startup race when creating the perf nr_addr_filters sysfs file x86/mce: Mark fatal MCE's page as poison to avoid panic in the kdump kernel powerpc/lib: Validate size for vector operations powerpc: pmd_move_must_withdraw() is only needed for CONFIG_TRANSPARENT_HUGEPAGE powerpc/mm: Fix build failures due to arch_reserved_kernel_pages() powerpc: Fix build error due to is_valid_bugaddr() powerpc/mm: Fix null-pointer dereference in pgtable_cache_add x86/entry/ia32: Ensure s32 is sign extended to s64 tick/sched: Preserve number of idle sleeps across CPU hotplug events mips: Call lose_fpu(0) before initializing fcr31 in mips_set_personality_nan spi: bcm-qspi: fix SFDP BFPT read by usig mspi read gpio: eic-sprd: Clear interrupt after set the interrupt type drm/exynos: gsc: minor fix for loop iteration in gsc_runtime_resume drm/exynos: fix accidental on-stack copy of exynos_drm_plane drm/bridge: nxp-ptn3460: simplify some error checking drm/bridge: nxp-ptn3460: fix i2c_master_send() error checking drm: Don't unref the same fb many times by mistake due to deadlock handling gpiolib: acpi: Ignore touchpad wakeup on GPD G1619-04 netfilter: nf_tables: reject QUEUE/DROP verdict parameters rbd: don't move requests to the running list on errors btrfs: defrag: reject unknown flags of btrfs_ioctl_defrag_range_args btrfs: don't warn if discard range is not aligned to sector btrfs: tree-checker: fix inline ref size in error messages btrfs: ref-verify: free ref cache before clearing mount opt net: fec: fix the unhandled context fault from smmu fjes: fix memleaks in fjes_hw_setup netfilter: nf_tables: validate NFPROTO_* family netfilter: nf_tables: restrict anonymous set and map names to 16 bytes net/mlx5e: fix a double-free in arfs_create_groups net/mlx5: Use kfree(ft->g) in arfs_create_groups() net/mlx5: DR, Use the right GVMI number for drop action netlink: fix potential sleeping issue in mqueue_flush_file tcp: Add memory barrier to tcp_push() afs: Hide silly-rename files from userspace tracing: Ensure visibility when inserting an element into tracing_map net/rds: Fix UBSAN: array-index-out-of-bounds in rds_cmsg_recv llc: Drop support for ETH_P_TR_802_2. llc: make llc_ui_sendmsg() more robust against bonding changes vlan: skip nested type that is not IFLA_VLAN_QOS_MAPPING net/smc: fix illegal rmb_desc access in SMC-D connection dump x86/CPU/AMD: Fix disabling XSAVES on AMD family 0x17 due to erratum powerpc: Use always instead of always-y in for crtsavres.o fs: move S_ISGID stripping into the vfs_*() helpers fs: add mode_strip_sgid() helper mtd: spinand: macronix: Fix MX35LFxGE4AD page size block: Remove special-casing of compound pages rename(): fix the locking of subdirectories ubifs: ubifs_symlink: Fix memleak of inode->i_link in error path nouveau/vmm: don't set addr on the fail path to avoid warning mmc: core: Use mrq.sbc in close-ended ffu arm64: dts: qcom: sdm845: fix USB wakeup interrupt types parisc/firmware: Fix F-extend for PDC addresses rpmsg: virtio: Free driver_override when rpmsg_remove() hwrng: core - Fix page fault dead lock on mmap-ed hwrng PM: hibernate: Enforce ordering during image compression/decompression crypto: api - Disallow identical driver names ext4: allow for the last group to be marked as trimmed serial: sc16is7xx: add check for unsupported SPI modes during probe spi: introduce SPI_MODE_X_MASK macro serial: sc16is7xx: set safe default SPI clock frequency units: add the HZ macros units: change from 'L' to 'UL' units: Add Watt units include/linux/units.h: add helpers for kelvin to/from Celsius conversion PCI: mediatek: Clear interrupt status before dispatching handler Conflicts: include/linux/timer.h mm/memory-failure.c Change-Id: I4974903c79ecddc3d9225b0b723a30b6c83ef572
1048 lines
27 KiB
C
1048 lines
27 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* RAM Oops/Panic logger
|
|
*
|
|
* Copyright (C) 2010 Marco Stornelli <marco.stornelli@gmail.com>
|
|
* Copyright (C) 2011 Kees Cook <keescook@chromium.org>
|
|
*/
|
|
|
|
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/err.h>
|
|
#include <linux/module.h>
|
|
#include <linux/version.h>
|
|
#include <linux/pstore.h>
|
|
#include <linux/io.h>
|
|
#include <linux/ioport.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/compiler.h>
|
|
#include <linux/pstore_ram.h>
|
|
#include <linux/of.h>
|
|
#include <linux/of_address.h>
|
|
#include <soc/qcom/minidump.h>
|
|
|
|
#define RAMOOPS_KERNMSG_HDR "===="
|
|
#define MIN_MEM_SIZE 4096UL
|
|
|
|
static ulong record_size = MIN_MEM_SIZE;
|
|
module_param(record_size, ulong, 0400);
|
|
MODULE_PARM_DESC(record_size,
|
|
"size of each dump done on oops/panic");
|
|
|
|
static ulong ramoops_console_size = MIN_MEM_SIZE;
|
|
module_param_named(console_size, ramoops_console_size, ulong, 0400);
|
|
MODULE_PARM_DESC(console_size, "size of kernel console log");
|
|
|
|
static ulong ramoops_ftrace_size = MIN_MEM_SIZE;
|
|
module_param_named(ftrace_size, ramoops_ftrace_size, ulong, 0400);
|
|
MODULE_PARM_DESC(ftrace_size, "size of ftrace log");
|
|
|
|
static ulong ramoops_pmsg_size = MIN_MEM_SIZE;
|
|
module_param_named(pmsg_size, ramoops_pmsg_size, ulong, 0400);
|
|
MODULE_PARM_DESC(pmsg_size, "size of user space message log");
|
|
|
|
static unsigned long long mem_address;
|
|
module_param_hw(mem_address, ullong, other, 0400);
|
|
MODULE_PARM_DESC(mem_address,
|
|
"start of reserved RAM used to store oops/panic logs");
|
|
|
|
static ulong mem_size;
|
|
module_param(mem_size, ulong, 0400);
|
|
MODULE_PARM_DESC(mem_size,
|
|
"size of reserved RAM used to store oops/panic logs");
|
|
|
|
static unsigned int mem_type;
|
|
module_param(mem_type, uint, 0600);
|
|
MODULE_PARM_DESC(mem_type,
|
|
"set to 1 to try to use unbuffered memory (default 0)");
|
|
|
|
static int dump_oops = 1;
|
|
module_param(dump_oops, int, 0600);
|
|
MODULE_PARM_DESC(dump_oops,
|
|
"set to 1 to dump oopses, 0 to only dump panics (default 1)");
|
|
|
|
static int ramoops_ecc;
|
|
module_param_named(ecc, ramoops_ecc, int, 0600);
|
|
MODULE_PARM_DESC(ramoops_ecc,
|
|
"if non-zero, the option enables ECC support and specifies "
|
|
"ECC buffer size in bytes (1 is a special value, means 16 "
|
|
"bytes ECC)");
|
|
|
|
struct ramoops_context {
|
|
struct persistent_ram_zone **dprzs; /* Oops dump zones */
|
|
struct persistent_ram_zone *cprz; /* Console zone */
|
|
struct persistent_ram_zone **fprzs; /* Ftrace zones */
|
|
struct persistent_ram_zone *mprz; /* PMSG zone */
|
|
phys_addr_t phys_addr;
|
|
unsigned long size;
|
|
unsigned int memtype;
|
|
size_t record_size;
|
|
size_t console_size;
|
|
size_t ftrace_size;
|
|
size_t pmsg_size;
|
|
int dump_oops;
|
|
u32 flags;
|
|
struct persistent_ram_ecc_info ecc_info;
|
|
unsigned int max_dump_cnt;
|
|
unsigned int dump_write_cnt;
|
|
/* _read_cnt need clear on ramoops_pstore_open */
|
|
unsigned int dump_read_cnt;
|
|
unsigned int console_read_cnt;
|
|
unsigned int max_ftrace_cnt;
|
|
unsigned int ftrace_read_cnt;
|
|
unsigned int pmsg_read_cnt;
|
|
struct pstore_info pstore;
|
|
};
|
|
|
|
static struct platform_device *dummy;
|
|
|
|
static void register_minidump(struct ramoops_context *cxt)
|
|
{
|
|
int i;
|
|
struct md_region pstore_entry;
|
|
struct persistent_ram_zone *prz;
|
|
|
|
for (i = 0; i < cxt->max_dump_cnt; i++) {
|
|
prz = cxt->dprzs[i];
|
|
scnprintf(pstore_entry.name, sizeof(pstore_entry.name),
|
|
"KDMESG%d", i);
|
|
pstore_entry.virt_addr = (u64)(prz->vaddr);
|
|
pstore_entry.phys_addr = prz->paddr;
|
|
pstore_entry.size = prz->size;
|
|
if (msm_minidump_add_region(&pstore_entry) < 0)
|
|
pr_err("failed to add dmesg in minidump\n");
|
|
}
|
|
if (cxt->console_size) {
|
|
prz = cxt->cprz;
|
|
strlcpy(pstore_entry.name, "KCONSOLE",
|
|
sizeof(pstore_entry.name));
|
|
pstore_entry.virt_addr = (u64)(prz->vaddr);
|
|
pstore_entry.phys_addr = prz->paddr;
|
|
pstore_entry.size = prz->size;
|
|
if (msm_minidump_add_region(&pstore_entry) < 0)
|
|
pr_err("failed to add console in minidump\n");
|
|
}
|
|
for (i = 0; i < cxt->max_ftrace_cnt; i++) {
|
|
prz = cxt->fprzs[i];
|
|
scnprintf(pstore_entry.name, sizeof(pstore_entry.name),
|
|
"KFTRACE%d", i);
|
|
pstore_entry.virt_addr = (u64)(prz->vaddr);
|
|
pstore_entry.phys_addr = prz->paddr;
|
|
pstore_entry.size = prz->size;
|
|
if (msm_minidump_add_region(&pstore_entry) < 0)
|
|
pr_err("failed to add ftrace in minidump\n");
|
|
}
|
|
if (cxt->pmsg_size) {
|
|
prz = cxt->mprz;
|
|
strlcpy(pstore_entry.name, "KPMSG",
|
|
sizeof(pstore_entry.name));
|
|
pstore_entry.virt_addr = (u64)(prz->vaddr);
|
|
pstore_entry.phys_addr = prz->paddr;
|
|
pstore_entry.size = prz->size;
|
|
if (msm_minidump_add_region(&pstore_entry) < 0)
|
|
pr_err("failed to add pmsg in minidump\n");
|
|
}
|
|
}
|
|
|
|
static int ramoops_pstore_open(struct pstore_info *psi)
|
|
{
|
|
struct ramoops_context *cxt = psi->data;
|
|
|
|
cxt->dump_read_cnt = 0;
|
|
cxt->console_read_cnt = 0;
|
|
cxt->ftrace_read_cnt = 0;
|
|
cxt->pmsg_read_cnt = 0;
|
|
return 0;
|
|
}
|
|
|
|
static struct persistent_ram_zone *
|
|
ramoops_get_next_prz(struct persistent_ram_zone *przs[], int id,
|
|
struct pstore_record *record)
|
|
{
|
|
struct persistent_ram_zone *prz;
|
|
|
|
/* Give up if we never existed or have hit the end. */
|
|
if (!przs)
|
|
return NULL;
|
|
|
|
prz = przs[id];
|
|
if (!prz)
|
|
return NULL;
|
|
|
|
/* Update old/shadowed buffer. */
|
|
if (prz->type == PSTORE_TYPE_DMESG)
|
|
persistent_ram_save_old(prz);
|
|
|
|
if (!persistent_ram_old_size(prz))
|
|
return NULL;
|
|
|
|
record->type = prz->type;
|
|
record->id = id;
|
|
|
|
return prz;
|
|
}
|
|
|
|
static int ramoops_read_kmsg_hdr(char *buffer, struct timespec64 *time,
|
|
bool *compressed)
|
|
{
|
|
char data_type;
|
|
int header_length = 0;
|
|
|
|
if (sscanf(buffer, RAMOOPS_KERNMSG_HDR "%lld.%lu-%c\n%n",
|
|
(time64_t *)&time->tv_sec, &time->tv_nsec, &data_type,
|
|
&header_length) == 3) {
|
|
time->tv_nsec *= 1000;
|
|
if (data_type == 'C')
|
|
*compressed = true;
|
|
else
|
|
*compressed = false;
|
|
} else if (sscanf(buffer, RAMOOPS_KERNMSG_HDR "%lld.%lu\n%n",
|
|
(time64_t *)&time->tv_sec, &time->tv_nsec,
|
|
&header_length) == 2) {
|
|
time->tv_nsec *= 1000;
|
|
*compressed = false;
|
|
} else {
|
|
time->tv_sec = 0;
|
|
time->tv_nsec = 0;
|
|
*compressed = false;
|
|
}
|
|
return header_length;
|
|
}
|
|
|
|
static bool prz_ok(struct persistent_ram_zone *prz)
|
|
{
|
|
return !!prz && !!(persistent_ram_old_size(prz) +
|
|
persistent_ram_ecc_string(prz, NULL, 0));
|
|
}
|
|
|
|
static ssize_t ftrace_log_combine(struct persistent_ram_zone *dest,
|
|
struct persistent_ram_zone *src)
|
|
{
|
|
size_t dest_size, src_size, total, dest_off, src_off;
|
|
size_t dest_idx = 0, src_idx = 0, merged_idx = 0;
|
|
void *merged_buf;
|
|
struct pstore_ftrace_record *drec, *srec, *mrec;
|
|
size_t record_size = sizeof(struct pstore_ftrace_record);
|
|
|
|
dest_off = dest->old_log_size % record_size;
|
|
dest_size = dest->old_log_size - dest_off;
|
|
|
|
src_off = src->old_log_size % record_size;
|
|
src_size = src->old_log_size - src_off;
|
|
|
|
total = dest_size + src_size;
|
|
merged_buf = kmalloc(total, GFP_KERNEL);
|
|
if (!merged_buf)
|
|
return -ENOMEM;
|
|
|
|
drec = (struct pstore_ftrace_record *)(dest->old_log + dest_off);
|
|
srec = (struct pstore_ftrace_record *)(src->old_log + src_off);
|
|
mrec = (struct pstore_ftrace_record *)(merged_buf);
|
|
|
|
while (dest_size > 0 && src_size > 0) {
|
|
if (pstore_ftrace_read_timestamp(&drec[dest_idx]) <
|
|
pstore_ftrace_read_timestamp(&srec[src_idx])) {
|
|
mrec[merged_idx++] = drec[dest_idx++];
|
|
dest_size -= record_size;
|
|
} else {
|
|
mrec[merged_idx++] = srec[src_idx++];
|
|
src_size -= record_size;
|
|
}
|
|
}
|
|
|
|
while (dest_size > 0) {
|
|
mrec[merged_idx++] = drec[dest_idx++];
|
|
dest_size -= record_size;
|
|
}
|
|
|
|
while (src_size > 0) {
|
|
mrec[merged_idx++] = srec[src_idx++];
|
|
src_size -= record_size;
|
|
}
|
|
|
|
kfree(dest->old_log);
|
|
dest->old_log = merged_buf;
|
|
dest->old_log_size = total;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static ssize_t ramoops_pstore_read(struct pstore_record *record)
|
|
{
|
|
ssize_t size = 0;
|
|
struct ramoops_context *cxt = record->psi->data;
|
|
struct persistent_ram_zone *prz = NULL;
|
|
int header_length = 0;
|
|
bool free_prz = false;
|
|
|
|
/*
|
|
* Ramoops headers provide time stamps for PSTORE_TYPE_DMESG, but
|
|
* PSTORE_TYPE_CONSOLE and PSTORE_TYPE_FTRACE don't currently have
|
|
* valid time stamps, so it is initialized to zero.
|
|
*/
|
|
record->time.tv_sec = 0;
|
|
record->time.tv_nsec = 0;
|
|
record->compressed = false;
|
|
|
|
/* Find the next valid persistent_ram_zone for DMESG */
|
|
while (cxt->dump_read_cnt < cxt->max_dump_cnt && !prz) {
|
|
prz = ramoops_get_next_prz(cxt->dprzs, cxt->dump_read_cnt++,
|
|
record);
|
|
if (!prz_ok(prz))
|
|
continue;
|
|
header_length = ramoops_read_kmsg_hdr(persistent_ram_old(prz),
|
|
&record->time,
|
|
&record->compressed);
|
|
/* Clear and skip this DMESG record if it has no valid header */
|
|
if (!header_length) {
|
|
persistent_ram_free_old(prz);
|
|
persistent_ram_zap(prz);
|
|
prz = NULL;
|
|
}
|
|
}
|
|
|
|
if (!prz_ok(prz) && !cxt->console_read_cnt++)
|
|
prz = ramoops_get_next_prz(&cxt->cprz, 0 /* single */, record);
|
|
|
|
if (!prz_ok(prz) && !cxt->pmsg_read_cnt++)
|
|
prz = ramoops_get_next_prz(&cxt->mprz, 0 /* single */, record);
|
|
|
|
/* ftrace is last since it may want to dynamically allocate memory. */
|
|
if (!prz_ok(prz)) {
|
|
if (!(cxt->flags & RAMOOPS_FLAG_FTRACE_PER_CPU) &&
|
|
!cxt->ftrace_read_cnt++) {
|
|
prz = ramoops_get_next_prz(cxt->fprzs, 0 /* single */,
|
|
record);
|
|
} else {
|
|
/*
|
|
* Build a new dummy record which combines all the
|
|
* per-cpu records including metadata and ecc info.
|
|
*/
|
|
struct persistent_ram_zone *tmp_prz, *prz_next;
|
|
|
|
tmp_prz = kzalloc(sizeof(struct persistent_ram_zone),
|
|
GFP_KERNEL);
|
|
if (!tmp_prz)
|
|
return -ENOMEM;
|
|
prz = tmp_prz;
|
|
free_prz = true;
|
|
|
|
while (cxt->ftrace_read_cnt < cxt->max_ftrace_cnt) {
|
|
prz_next = ramoops_get_next_prz(cxt->fprzs,
|
|
cxt->ftrace_read_cnt++, record);
|
|
|
|
if (!prz_ok(prz_next))
|
|
continue;
|
|
|
|
tmp_prz->ecc_info = prz_next->ecc_info;
|
|
tmp_prz->corrected_bytes +=
|
|
prz_next->corrected_bytes;
|
|
tmp_prz->bad_blocks += prz_next->bad_blocks;
|
|
size = ftrace_log_combine(tmp_prz, prz_next);
|
|
if (size)
|
|
goto out;
|
|
}
|
|
record->id = 0;
|
|
}
|
|
}
|
|
|
|
if (!prz_ok(prz)) {
|
|
size = 0;
|
|
goto out;
|
|
}
|
|
|
|
size = persistent_ram_old_size(prz) - header_length;
|
|
|
|
/* ECC correction notice */
|
|
record->ecc_notice_size = persistent_ram_ecc_string(prz, NULL, 0);
|
|
|
|
record->buf = kmalloc(size + record->ecc_notice_size + 1, GFP_KERNEL);
|
|
if (record->buf == NULL) {
|
|
size = -ENOMEM;
|
|
goto out;
|
|
}
|
|
|
|
memcpy(record->buf, (char *)persistent_ram_old(prz) + header_length,
|
|
size);
|
|
|
|
persistent_ram_ecc_string(prz, record->buf + size,
|
|
record->ecc_notice_size + 1);
|
|
|
|
out:
|
|
if (free_prz) {
|
|
kfree(prz->old_log);
|
|
kfree(prz);
|
|
}
|
|
|
|
return size;
|
|
}
|
|
|
|
static size_t ramoops_write_kmsg_hdr(struct persistent_ram_zone *prz,
|
|
struct pstore_record *record)
|
|
{
|
|
char hdr[36]; /* "===="(4), %lld(20), "."(1), %06lu(6), "-%c\n"(3) */
|
|
size_t len;
|
|
|
|
len = scnprintf(hdr, sizeof(hdr),
|
|
RAMOOPS_KERNMSG_HDR "%lld.%06lu-%c\n",
|
|
(time64_t)record->time.tv_sec,
|
|
record->time.tv_nsec / 1000,
|
|
record->compressed ? 'C' : 'D');
|
|
persistent_ram_write(prz, hdr, len);
|
|
|
|
return len;
|
|
}
|
|
|
|
static int notrace ramoops_pstore_write(struct pstore_record *record)
|
|
{
|
|
struct ramoops_context *cxt = record->psi->data;
|
|
struct persistent_ram_zone *prz;
|
|
size_t size, hlen;
|
|
|
|
if (record->type == PSTORE_TYPE_CONSOLE) {
|
|
if (!cxt->cprz)
|
|
return -ENOMEM;
|
|
persistent_ram_write(cxt->cprz, record->buf, record->size);
|
|
return 0;
|
|
} else if (record->type == PSTORE_TYPE_FTRACE) {
|
|
int zonenum;
|
|
|
|
if (!cxt->fprzs)
|
|
return -ENOMEM;
|
|
/*
|
|
* Choose zone by if we're using per-cpu buffers.
|
|
*/
|
|
if (cxt->flags & RAMOOPS_FLAG_FTRACE_PER_CPU)
|
|
zonenum = smp_processor_id();
|
|
else
|
|
zonenum = 0;
|
|
|
|
persistent_ram_write(cxt->fprzs[zonenum], record->buf,
|
|
record->size);
|
|
return 0;
|
|
} else if (record->type == PSTORE_TYPE_PMSG) {
|
|
pr_warn_ratelimited("PMSG shouldn't call %s\n", __func__);
|
|
return -EINVAL;
|
|
}
|
|
|
|
if (record->type != PSTORE_TYPE_DMESG)
|
|
return -EINVAL;
|
|
|
|
/*
|
|
* Out of the various dmesg dump types, ramoops is currently designed
|
|
* to only store crash logs, rather than storing general kernel logs.
|
|
*/
|
|
if (record->reason != KMSG_DUMP_OOPS &&
|
|
record->reason != KMSG_DUMP_PANIC)
|
|
return -EINVAL;
|
|
|
|
/* Skip Oopes when configured to do so. */
|
|
if (record->reason == KMSG_DUMP_OOPS && !cxt->dump_oops)
|
|
return -EINVAL;
|
|
|
|
/*
|
|
* Explicitly only take the first part of any new crash.
|
|
* If our buffer is larger than kmsg_bytes, this can never happen,
|
|
* and if our buffer is smaller than kmsg_bytes, we don't want the
|
|
* report split across multiple records.
|
|
*/
|
|
if (record->part != 1)
|
|
return -ENOSPC;
|
|
|
|
if (!cxt->dprzs)
|
|
return -ENOSPC;
|
|
|
|
prz = cxt->dprzs[cxt->dump_write_cnt];
|
|
|
|
/*
|
|
* Since this is a new crash dump, we need to reset the buffer in
|
|
* case it still has an old dump present. Without this, the new dump
|
|
* will get appended, which would seriously confuse anything trying
|
|
* to check dump file contents. Specifically, ramoops_read_kmsg_hdr()
|
|
* expects to find a dump header in the beginning of buffer data, so
|
|
* we must to reset the buffer values, in order to ensure that the
|
|
* header will be written to the beginning of the buffer.
|
|
*/
|
|
persistent_ram_zap(prz);
|
|
|
|
/* Build header and append record contents. */
|
|
hlen = ramoops_write_kmsg_hdr(prz, record);
|
|
if (!hlen)
|
|
return -ENOMEM;
|
|
|
|
size = record->size;
|
|
if (size + hlen > prz->buffer_size)
|
|
size = prz->buffer_size - hlen;
|
|
persistent_ram_write(prz, record->buf, size);
|
|
|
|
cxt->dump_write_cnt = (cxt->dump_write_cnt + 1) % cxt->max_dump_cnt;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int notrace ramoops_pstore_write_user(struct pstore_record *record,
|
|
const char __user *buf)
|
|
{
|
|
if (record->type == PSTORE_TYPE_PMSG) {
|
|
struct ramoops_context *cxt = record->psi->data;
|
|
|
|
if (!cxt->mprz)
|
|
return -ENOMEM;
|
|
return persistent_ram_write_user(cxt->mprz, buf, record->size);
|
|
}
|
|
|
|
return -EINVAL;
|
|
}
|
|
|
|
static int ramoops_pstore_erase(struct pstore_record *record)
|
|
{
|
|
struct ramoops_context *cxt = record->psi->data;
|
|
struct persistent_ram_zone *prz;
|
|
|
|
switch (record->type) {
|
|
case PSTORE_TYPE_DMESG:
|
|
if (record->id >= cxt->max_dump_cnt)
|
|
return -EINVAL;
|
|
prz = cxt->dprzs[record->id];
|
|
break;
|
|
case PSTORE_TYPE_CONSOLE:
|
|
prz = cxt->cprz;
|
|
break;
|
|
case PSTORE_TYPE_FTRACE:
|
|
if (record->id >= cxt->max_ftrace_cnt)
|
|
return -EINVAL;
|
|
prz = cxt->fprzs[record->id];
|
|
break;
|
|
case PSTORE_TYPE_PMSG:
|
|
prz = cxt->mprz;
|
|
break;
|
|
default:
|
|
return -EINVAL;
|
|
}
|
|
|
|
persistent_ram_free_old(prz);
|
|
persistent_ram_zap(prz);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static struct ramoops_context oops_cxt = {
|
|
.pstore = {
|
|
.owner = THIS_MODULE,
|
|
.name = "ramoops",
|
|
.open = ramoops_pstore_open,
|
|
.read = ramoops_pstore_read,
|
|
.write = ramoops_pstore_write,
|
|
.write_user = ramoops_pstore_write_user,
|
|
.erase = ramoops_pstore_erase,
|
|
},
|
|
};
|
|
|
|
static void ramoops_free_przs(struct ramoops_context *cxt)
|
|
{
|
|
int i;
|
|
|
|
/* Free dump PRZs */
|
|
if (cxt->dprzs) {
|
|
for (i = 0; i < cxt->max_dump_cnt; i++)
|
|
persistent_ram_free(cxt->dprzs[i]);
|
|
|
|
kfree(cxt->dprzs);
|
|
cxt->max_dump_cnt = 0;
|
|
}
|
|
|
|
/* Free ftrace PRZs */
|
|
if (cxt->fprzs) {
|
|
for (i = 0; i < cxt->max_ftrace_cnt; i++)
|
|
persistent_ram_free(cxt->fprzs[i]);
|
|
kfree(cxt->fprzs);
|
|
cxt->max_ftrace_cnt = 0;
|
|
}
|
|
}
|
|
|
|
static int ramoops_init_przs(const char *name,
|
|
struct device *dev, struct ramoops_context *cxt,
|
|
struct persistent_ram_zone ***przs,
|
|
phys_addr_t *paddr, size_t mem_sz,
|
|
ssize_t record_size,
|
|
unsigned int *cnt, u32 sig, u32 flags)
|
|
{
|
|
int err = -ENOMEM;
|
|
int i;
|
|
size_t zone_sz;
|
|
struct persistent_ram_zone **prz_ar;
|
|
|
|
/* Allocate nothing for 0 mem_sz or 0 record_size. */
|
|
if (mem_sz == 0 || record_size == 0) {
|
|
*cnt = 0;
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* If we have a negative record size, calculate it based on
|
|
* mem_sz / *cnt. If we have a positive record size, calculate
|
|
* cnt from mem_sz / record_size.
|
|
*/
|
|
if (record_size < 0) {
|
|
if (*cnt == 0)
|
|
return 0;
|
|
record_size = mem_sz / *cnt;
|
|
if (record_size == 0) {
|
|
dev_err(dev, "%s record size == 0 (%zu / %u)\n",
|
|
name, mem_sz, *cnt);
|
|
goto fail;
|
|
}
|
|
} else {
|
|
*cnt = mem_sz / record_size;
|
|
if (*cnt == 0) {
|
|
dev_err(dev, "%s record count == 0 (%zu / %zu)\n",
|
|
name, mem_sz, record_size);
|
|
goto fail;
|
|
}
|
|
}
|
|
|
|
if (*paddr + mem_sz - cxt->phys_addr > cxt->size) {
|
|
dev_err(dev, "no room for %s mem region (0x%zx@0x%llx) in (0x%lx@0x%llx)\n",
|
|
name,
|
|
mem_sz, (unsigned long long)*paddr,
|
|
cxt->size, (unsigned long long)cxt->phys_addr);
|
|
goto fail;
|
|
}
|
|
|
|
zone_sz = mem_sz / *cnt;
|
|
zone_sz = ALIGN_DOWN(zone_sz, 2);
|
|
if (!zone_sz) {
|
|
dev_err(dev, "%s zone size == 0\n", name);
|
|
goto fail;
|
|
}
|
|
|
|
prz_ar = kcalloc(*cnt, sizeof(**przs), GFP_KERNEL);
|
|
if (!prz_ar)
|
|
goto fail;
|
|
|
|
for (i = 0; i < *cnt; i++) {
|
|
char *label;
|
|
|
|
if (*cnt == 1)
|
|
label = kasprintf(GFP_KERNEL, "ramoops:%s", name);
|
|
else
|
|
label = kasprintf(GFP_KERNEL, "ramoops:%s(%d/%d)",
|
|
name, i, *cnt - 1);
|
|
prz_ar[i] = persistent_ram_new(*paddr, zone_sz, sig,
|
|
&cxt->ecc_info,
|
|
cxt->memtype, flags, label);
|
|
kfree(label);
|
|
if (IS_ERR(prz_ar[i])) {
|
|
err = PTR_ERR(prz_ar[i]);
|
|
dev_err(dev, "failed to request %s mem region (0x%zx@0x%llx): %d\n",
|
|
name, record_size,
|
|
(unsigned long long)*paddr, err);
|
|
|
|
while (i > 0) {
|
|
i--;
|
|
persistent_ram_free(prz_ar[i]);
|
|
}
|
|
kfree(prz_ar);
|
|
goto fail;
|
|
}
|
|
*paddr += zone_sz;
|
|
prz_ar[i]->type = pstore_name_to_type(name);
|
|
}
|
|
|
|
*przs = prz_ar;
|
|
return 0;
|
|
|
|
fail:
|
|
*cnt = 0;
|
|
return err;
|
|
}
|
|
|
|
static int ramoops_init_prz(const char *name,
|
|
struct device *dev, struct ramoops_context *cxt,
|
|
struct persistent_ram_zone **prz,
|
|
phys_addr_t *paddr, size_t sz, u32 sig)
|
|
{
|
|
char *label;
|
|
|
|
if (!sz)
|
|
return 0;
|
|
|
|
if (*paddr + sz - cxt->phys_addr > cxt->size) {
|
|
dev_err(dev, "no room for %s mem region (0x%zx@0x%llx) in (0x%lx@0x%llx)\n",
|
|
name, sz, (unsigned long long)*paddr,
|
|
cxt->size, (unsigned long long)cxt->phys_addr);
|
|
return -ENOMEM;
|
|
}
|
|
|
|
label = kasprintf(GFP_KERNEL, "ramoops:%s", name);
|
|
*prz = persistent_ram_new(*paddr, sz, sig, &cxt->ecc_info,
|
|
cxt->memtype, PRZ_FLAG_ZAP_OLD, label);
|
|
kfree(label);
|
|
if (IS_ERR(*prz)) {
|
|
int err = PTR_ERR(*prz);
|
|
|
|
dev_err(dev, "failed to request %s mem region (0x%zx@0x%llx): %d\n",
|
|
name, sz, (unsigned long long)*paddr, err);
|
|
return err;
|
|
}
|
|
|
|
*paddr += sz;
|
|
(*prz)->type = pstore_name_to_type(name);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int ramoops_parse_dt_size(struct platform_device *pdev,
|
|
const char *propname, u32 *value)
|
|
{
|
|
u32 val32 = 0;
|
|
int ret;
|
|
|
|
ret = of_property_read_u32(pdev->dev.of_node, propname, &val32);
|
|
if (ret < 0 && ret != -EINVAL) {
|
|
dev_err(&pdev->dev, "failed to parse property %s: %d\n",
|
|
propname, ret);
|
|
return ret;
|
|
}
|
|
|
|
if (val32 > INT_MAX) {
|
|
dev_err(&pdev->dev, "%s %u > INT_MAX\n", propname, val32);
|
|
return -EOVERFLOW;
|
|
}
|
|
|
|
*value = val32;
|
|
return 0;
|
|
}
|
|
|
|
static int ramoops_parse_dt(struct platform_device *pdev,
|
|
struct ramoops_platform_data *pdata)
|
|
{
|
|
struct device_node *of_node = pdev->dev.of_node;
|
|
struct device_node *parent_node;
|
|
struct resource *res;
|
|
u32 value;
|
|
int ret;
|
|
|
|
dev_dbg(&pdev->dev, "using Device Tree\n");
|
|
|
|
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
if (!res) {
|
|
dev_err(&pdev->dev,
|
|
"failed to locate DT /reserved-memory resource\n");
|
|
return -EINVAL;
|
|
}
|
|
|
|
pdata->mem_size = resource_size(res);
|
|
pdata->mem_address = res->start;
|
|
if (of_property_read_u32(of_node, "mem-type", &pdata->mem_type))
|
|
pdata->mem_type = of_property_read_bool(of_node, "unbuffered");
|
|
pdata->dump_oops = !of_property_read_bool(of_node, "no-dump-oops");
|
|
|
|
#define parse_size(name, field) { \
|
|
ret = ramoops_parse_dt_size(pdev, name, &value); \
|
|
if (ret < 0) \
|
|
return ret; \
|
|
field = value; \
|
|
}
|
|
|
|
parse_size("record-size", pdata->record_size);
|
|
parse_size("console-size", pdata->console_size);
|
|
parse_size("ftrace-size", pdata->ftrace_size);
|
|
parse_size("pmsg-size", pdata->pmsg_size);
|
|
parse_size("ecc-size", pdata->ecc_info.ecc_size);
|
|
parse_size("flags", pdata->flags);
|
|
|
|
#undef parse_size
|
|
|
|
/*
|
|
* Some old Chromebooks relied on the kernel setting the
|
|
* console_size and pmsg_size to the record size since that's
|
|
* what the downstream kernel did. These same Chromebooks had
|
|
* "ramoops" straight under the root node which isn't
|
|
* according to the current upstream bindings (though it was
|
|
* arguably acceptable under a prior version of the bindings).
|
|
* Let's make those old Chromebooks work by detecting that
|
|
* we're not a child of "reserved-memory" and mimicking the
|
|
* expected behavior.
|
|
*/
|
|
parent_node = of_get_parent(of_node);
|
|
if (!of_node_name_eq(parent_node, "reserved-memory") &&
|
|
!pdata->console_size && !pdata->ftrace_size &&
|
|
!pdata->pmsg_size && !pdata->ecc_info.ecc_size) {
|
|
pdata->console_size = pdata->record_size;
|
|
pdata->pmsg_size = pdata->record_size;
|
|
}
|
|
of_node_put(parent_node);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int ramoops_probe(struct platform_device *pdev)
|
|
{
|
|
struct device *dev = &pdev->dev;
|
|
struct ramoops_platform_data *pdata = dev->platform_data;
|
|
struct ramoops_platform_data pdata_local;
|
|
struct ramoops_context *cxt = &oops_cxt;
|
|
size_t dump_mem_sz;
|
|
phys_addr_t paddr;
|
|
int err = -EINVAL;
|
|
|
|
/*
|
|
* Only a single ramoops area allowed at a time, so fail extra
|
|
* probes.
|
|
*/
|
|
if (cxt->max_dump_cnt) {
|
|
pr_err("already initialized\n");
|
|
goto fail_out;
|
|
}
|
|
|
|
if (dev_of_node(dev) && !pdata) {
|
|
pdata = &pdata_local;
|
|
memset(pdata, 0, sizeof(*pdata));
|
|
|
|
err = ramoops_parse_dt(pdev, pdata);
|
|
if (err < 0)
|
|
goto fail_out;
|
|
}
|
|
|
|
/* Make sure we didn't get bogus platform data pointer. */
|
|
if (!pdata) {
|
|
pr_err("NULL platform data\n");
|
|
err = -EINVAL;
|
|
goto fail_out;
|
|
}
|
|
|
|
if (!pdata->mem_size || (!pdata->record_size && !pdata->console_size &&
|
|
!pdata->ftrace_size && !pdata->pmsg_size)) {
|
|
pr_err("The memory size and the record/console size must be "
|
|
"non-zero\n");
|
|
err = -EINVAL;
|
|
goto fail_out;
|
|
}
|
|
|
|
if (pdata->record_size && !is_power_of_2(pdata->record_size))
|
|
pdata->record_size = rounddown_pow_of_two(pdata->record_size);
|
|
if (pdata->console_size && !is_power_of_2(pdata->console_size))
|
|
pdata->console_size = rounddown_pow_of_two(pdata->console_size);
|
|
if (pdata->ftrace_size && !is_power_of_2(pdata->ftrace_size))
|
|
pdata->ftrace_size = rounddown_pow_of_two(pdata->ftrace_size);
|
|
if (pdata->pmsg_size && !is_power_of_2(pdata->pmsg_size))
|
|
pdata->pmsg_size = rounddown_pow_of_two(pdata->pmsg_size);
|
|
|
|
cxt->size = pdata->mem_size;
|
|
cxt->phys_addr = pdata->mem_address;
|
|
cxt->memtype = pdata->mem_type;
|
|
cxt->record_size = pdata->record_size;
|
|
cxt->console_size = pdata->console_size;
|
|
cxt->ftrace_size = pdata->ftrace_size;
|
|
cxt->pmsg_size = pdata->pmsg_size;
|
|
cxt->dump_oops = pdata->dump_oops;
|
|
cxt->flags = pdata->flags;
|
|
cxt->ecc_info = pdata->ecc_info;
|
|
|
|
paddr = cxt->phys_addr;
|
|
|
|
dump_mem_sz = cxt->size - cxt->console_size - cxt->ftrace_size
|
|
- cxt->pmsg_size;
|
|
err = ramoops_init_przs("dmesg", dev, cxt, &cxt->dprzs, &paddr,
|
|
dump_mem_sz, cxt->record_size,
|
|
&cxt->max_dump_cnt, 0, 0);
|
|
if (err)
|
|
goto fail_out;
|
|
|
|
err = ramoops_init_prz("console", dev, cxt, &cxt->cprz, &paddr,
|
|
cxt->console_size, 0);
|
|
if (err)
|
|
goto fail_init_cprz;
|
|
|
|
cxt->max_ftrace_cnt = (cxt->flags & RAMOOPS_FLAG_FTRACE_PER_CPU)
|
|
? nr_cpu_ids
|
|
: 1;
|
|
err = ramoops_init_przs("ftrace", dev, cxt, &cxt->fprzs, &paddr,
|
|
cxt->ftrace_size, -1,
|
|
&cxt->max_ftrace_cnt, LINUX_VERSION_CODE,
|
|
(cxt->flags & RAMOOPS_FLAG_FTRACE_PER_CPU)
|
|
? PRZ_FLAG_NO_LOCK : 0);
|
|
if (err)
|
|
goto fail_init_fprz;
|
|
|
|
err = ramoops_init_prz("pmsg", dev, cxt, &cxt->mprz, &paddr,
|
|
cxt->pmsg_size, 0);
|
|
if (err)
|
|
goto fail_init_mprz;
|
|
|
|
cxt->pstore.data = cxt;
|
|
/*
|
|
* Prepare frontend flags based on which areas are initialized.
|
|
* For ramoops_init_przs() cases, the "max count" variable tells
|
|
* if there are regions present. For ramoops_init_prz() cases,
|
|
* the single region size is how to check.
|
|
*/
|
|
cxt->pstore.flags = 0;
|
|
if (cxt->max_dump_cnt)
|
|
cxt->pstore.flags |= PSTORE_FLAGS_DMESG;
|
|
if (cxt->console_size)
|
|
cxt->pstore.flags |= PSTORE_FLAGS_CONSOLE;
|
|
if (cxt->max_ftrace_cnt)
|
|
cxt->pstore.flags |= PSTORE_FLAGS_FTRACE;
|
|
if (cxt->pmsg_size)
|
|
cxt->pstore.flags |= PSTORE_FLAGS_PMSG;
|
|
|
|
/*
|
|
* Since bufsize is only used for dmesg crash dumps, it
|
|
* must match the size of the dprz record (after PRZ header
|
|
* and ECC bytes have been accounted for).
|
|
*/
|
|
if (cxt->pstore.flags & PSTORE_FLAGS_DMESG) {
|
|
cxt->pstore.bufsize = cxt->dprzs[0]->buffer_size;
|
|
cxt->pstore.buf = kzalloc(cxt->pstore.bufsize, GFP_KERNEL);
|
|
if (!cxt->pstore.buf) {
|
|
pr_err("cannot allocate pstore crash dump buffer\n");
|
|
err = -ENOMEM;
|
|
goto fail_clear;
|
|
}
|
|
}
|
|
|
|
err = pstore_register(&cxt->pstore);
|
|
if (err) {
|
|
pr_err("registering with pstore failed\n");
|
|
goto fail_buf;
|
|
}
|
|
|
|
/*
|
|
* Update the module parameter variables as well so they are visible
|
|
* through /sys/module/ramoops/parameters/
|
|
*/
|
|
mem_size = pdata->mem_size;
|
|
mem_address = pdata->mem_address;
|
|
record_size = pdata->record_size;
|
|
dump_oops = pdata->dump_oops;
|
|
ramoops_console_size = pdata->console_size;
|
|
ramoops_pmsg_size = pdata->pmsg_size;
|
|
ramoops_ftrace_size = pdata->ftrace_size;
|
|
|
|
pr_info("using 0x%lx@0x%llx, ecc: %d\n",
|
|
cxt->size, (unsigned long long)cxt->phys_addr,
|
|
cxt->ecc_info.ecc_size);
|
|
|
|
register_minidump(cxt);
|
|
|
|
return 0;
|
|
|
|
fail_buf:
|
|
kfree(cxt->pstore.buf);
|
|
fail_clear:
|
|
cxt->pstore.bufsize = 0;
|
|
persistent_ram_free(cxt->mprz);
|
|
fail_init_mprz:
|
|
fail_init_fprz:
|
|
persistent_ram_free(cxt->cprz);
|
|
fail_init_cprz:
|
|
ramoops_free_przs(cxt);
|
|
fail_out:
|
|
return err;
|
|
}
|
|
|
|
static int ramoops_remove(struct platform_device *pdev)
|
|
{
|
|
struct ramoops_context *cxt = &oops_cxt;
|
|
|
|
pstore_unregister(&cxt->pstore);
|
|
|
|
kfree(cxt->pstore.buf);
|
|
cxt->pstore.bufsize = 0;
|
|
|
|
persistent_ram_free(cxt->mprz);
|
|
persistent_ram_free(cxt->cprz);
|
|
ramoops_free_przs(cxt);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct of_device_id dt_match[] = {
|
|
{ .compatible = "ramoops" },
|
|
{}
|
|
};
|
|
|
|
static struct platform_driver ramoops_driver = {
|
|
.probe = ramoops_probe,
|
|
.remove = ramoops_remove,
|
|
.driver = {
|
|
.name = "ramoops",
|
|
.of_match_table = dt_match,
|
|
},
|
|
};
|
|
|
|
static inline void ramoops_unregister_dummy(void)
|
|
{
|
|
platform_device_unregister(dummy);
|
|
dummy = NULL;
|
|
}
|
|
|
|
static void __init ramoops_register_dummy(void)
|
|
{
|
|
struct ramoops_platform_data pdata;
|
|
|
|
/*
|
|
* Prepare a dummy platform data structure to carry the module
|
|
* parameters. If mem_size isn't set, then there are no module
|
|
* parameters, and we can skip this.
|
|
*/
|
|
if (!mem_size)
|
|
return;
|
|
|
|
pr_info("using module parameters\n");
|
|
|
|
memset(&pdata, 0, sizeof(pdata));
|
|
pdata.mem_size = mem_size;
|
|
pdata.mem_address = mem_address;
|
|
pdata.mem_type = mem_type;
|
|
pdata.record_size = record_size;
|
|
pdata.console_size = ramoops_console_size;
|
|
pdata.ftrace_size = ramoops_ftrace_size;
|
|
pdata.pmsg_size = ramoops_pmsg_size;
|
|
pdata.dump_oops = dump_oops;
|
|
pdata.flags = RAMOOPS_FLAG_FTRACE_PER_CPU;
|
|
|
|
/*
|
|
* For backwards compatibility ramoops.ecc=1 means 16 bytes ECC
|
|
* (using 1 byte for ECC isn't much of use anyway).
|
|
*/
|
|
pdata.ecc_info.ecc_size = ramoops_ecc == 1 ? 16 : ramoops_ecc;
|
|
|
|
dummy = platform_device_register_data(NULL, "ramoops", -1,
|
|
&pdata, sizeof(pdata));
|
|
if (IS_ERR(dummy)) {
|
|
pr_info("could not create platform device: %ld\n",
|
|
PTR_ERR(dummy));
|
|
dummy = NULL;
|
|
ramoops_unregister_dummy();
|
|
}
|
|
}
|
|
|
|
static int __init ramoops_init(void)
|
|
{
|
|
int ret;
|
|
|
|
ramoops_register_dummy();
|
|
ret = platform_driver_register(&ramoops_driver);
|
|
if (ret != 0)
|
|
ramoops_unregister_dummy();
|
|
|
|
return ret;
|
|
}
|
|
postcore_initcall(ramoops_init);
|
|
|
|
static void __exit ramoops_exit(void)
|
|
{
|
|
platform_driver_unregister(&ramoops_driver);
|
|
ramoops_unregister_dummy();
|
|
}
|
|
module_exit(ramoops_exit);
|
|
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_AUTHOR("Marco Stornelli <marco.stornelli@gmail.com>");
|
|
MODULE_DESCRIPTION("RAM Oops/Panic logger/driver");
|