mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-06 03:45:24 -04:00
* refs/heads/tmp-a9a13ee: Linux 5.4.45 net: smsc911x: Fix runtime PM imbalance on error selftests: mlxsw: qos_mc_aware: Specify arping timeout as an integer net: ethernet: stmmac: Enable interface clocks on probe for IPQ806x net/ethernet/freescale: rework quiesce/activate for ucc_geth null_blk: return error for invalid zone size s390/mm: fix set_huge_pte_at() for empty ptes drm/edid: Add Oculus Rift S to non-desktop list net: bmac: Fix read of MAC address from ROM x86/mmiotrace: Use cpumask_available() for cpumask_var_t variables io_uring: initialize ctx->sqo_wait earlier i2c: altera: Fix race between xfer_msg and isr thread scsi: pm: Balance pm_only counter of request queue during system resume evm: Fix RCU list related warnings ARC: [plat-eznps]: Restrict to CONFIG_ISA_ARCOMPACT ARC: Fix ICCM & DCCM runtime size checks RDMA/qedr: Fix synchronization methods and memory leaks in qedr RDMA/qedr: Fix qpids xarray api used s390/ftrace: save traced function caller ASoC: intel - fix the card names spi: dw: use "smp_mb()" to avoid sending spi data error powerpc/xmon: Restrict when kernel is locked down powerpc/powernv: Avoid re-registration of imc debugfs directory scsi: hisi_sas: Check sas_port before using it drm/i915: fix port checks for MST support on gen >= 11 airo: Fix read overflows sending packets net: dsa: mt7530: set CPU port to fallback mode scsi: ufs: Release clock if DMA map fails media: staging: ipu3-imgu: Move alignment attribute to field media: Revert "staging: imgu: Address a compiler warning on alignment" mmc: fix compilation of user API kernel/relay.c: handle alloc_percpu returning NULL in relay_open mt76: mt76x02u: Add support for newer versions of the XBox One wifi adapter p54usb: add AirVasT USB stick device-id HID: i2c-hid: add Schneider SCL142ALM to descriptor override HID: multitouch: enable multi-input as a quirk for some devices HID: sony: Fix for broken buttons on DS3 USB dongles mm: Fix mremap not considering huge pmd devmap Revert "cgroup: Add memory barriers to plug cgroup_rstat_updated() race window" ANDROID: GKI: Enable SYS_HYPERVISOR ANDROID: Update ABI representation ANDROID: GKI: disable CONFIG_I2C_CHARDEV ANDROID: GKI: remove netfilter apis from supported symbols Linux 5.4.44 perf: Make perf able to build with latest libbfd netfilter: nf_conntrack_pptp: fix compilation warning with W=1 build netfilter: conntrack: Pass value of ctinfo to __nf_conntrack_update netfilter: conntrack: comparison of unsigned in cthelper confirmation bonding: Fix reference count leak in bond_sysfs_slave_add. net: dsa: declare lockless TX feature for slave ports ipv4: nexthop version of fib_info_nh_uses_dev nexthop: Expand nexthop_is_multipath in a few places nexthops: don't modify published nexthop groups nexthops: Move code from remove_nexthop_from_groups to remove_nh_grp_entry crypto: chelsio/chtls: properly set tp->lsndtime qlcnic: fix missing release in qlcnic_83xx_interrupt_test. xsk: Add overflow check for u64 division, stored into u32 ieee80211: Fix incorrect mask for default PE duration bnxt_en: Fix accumulation of bp->net_stats_prev. esp6: get the right proto for transport mode in esp6_gso_encap netfilter: nf_conntrack_pptp: prevent buffer overflows in debug code netfilter: nfnetlink_cthelper: unbreak userspace helper support netfilter: conntrack: make conntrack userspace helpers work again netfilter: ipset: Fix subcounter update skip netfilter: nft_reject_bridge: enable reject with bridge vlan ip_vti: receive ipip packet by calling ip_tunnel_rcv xfrm: fix error in comment xfrm: fix a NULL-ptr deref in xfrm_local_error xfrm: fix a warning in xfrm_policy_insert_list xfrm interface: fix oops when deleting a x-netns interface xfrm: call xfrm_output_gso when inner_protocol is set in xfrm_output xfrm: remove the xfrm_state_put call becofe going to out_reset xfrm: do pskb_pull properly in __xfrm_transport_prep xfrm: allow to accept packets with ipv6 NEXTHDR_HOP in xfrm_input copy_xstate_to_kernel(): don't leave parts of destination uninitialized x86/dma: Fix max PFN arithmetic overflow on 32 bit systems mac80211: mesh: fix discovery timer re-arming issue / crash x86/syscalls: Revert "x86/syscalls: Make __X32_SYSCALL_BIT be unsigned long" cfg80211: fix debugfs rename crash parisc: Fix kernel panic in mem_init() iommu: Fix reference count leak in iommu_group_alloc. gpio: fix locking open drain IRQ lines Revert "block: end bio with BLK_STS_AGAIN in case of non-mq devs and REQ_NOWAIT" include/asm-generic/topology.h: guard cpumask_of_node() macro argument fs/binfmt_elf.c: allocate initialized memory in fill_thread_core_info() mm: remove VM_BUG_ON(PageSlab()) from page_mapcount() mm,thp: stop leaking unreleased file pages IB/ipoib: Fix double free of skb in case of multicast traffic in CM mode drm/amd/display: drop cursor position check in atomic test RDMA/core: Fix double destruction of uobject ceph: flush release queue when handling caps for unknown inode libceph: ignore pool overlay and cache logic on redirects ALSA: hda/realtek - Add new codec supported for ALC287 ALSA: usb-audio: Quirks for Gigabyte TRX40 Aorus Master onboard audio clk: qcom: gcc: Fix parent for gpll0_out_even exec: Always set cap_ambient in cap_bprm_set_creds ALSA: usb-audio: mixer: volume quirk for ESS Technology Asus USB DAC ALSA: hda/realtek - Add a model for Thinkpad T570 without DAC workaround ALSA: hwdep: fix a left shifting 1 by 31 UB bug RDMA/pvrdma: Fix missing pci disable in pvrdma_pci_probe() gpio: bcm-kona: Fix return value of bcm_kona_gpio_probe() gpio: pxa: Fix return value of pxa_gpio_probe() mmc: block: Fix use-after-free issue for rpmb ARM: dts: bcm: HR2: Fix PPI interrupt types ARM: dts: bcm2835-rpi-zero-w: Fix led polarity ARM: dts/imx6q-bx50v3: Set display interface clock parents IB/qib: Call kobject_put() when kobject_init_and_add() fails gpu/drm: Ingenic: Fix opaque pointer casted to wrong type soc: mediatek: cmdq: return send msg error code arm64: dts: mt8173: fix vcodec-enc clock gpio: exar: Fix bad handling for ida_simple_get error path ARM: uaccess: fix DACR mismatch with nested exceptions ARM: uaccess: integrate uaccess_save and uaccess_restore ARM: uaccess: consolidate uaccess asm to asm/uaccess-asm.h ARM: 8970/1: decompressor: increase tag size Input: synaptics-rmi4 - fix error return code in rmi_driver_probe() Input: synaptics-rmi4 - really fix attn_data use-after-free Input: i8042 - add ThinkPad S230u to i8042 reset list Input: dlink-dir685-touchkeys - fix a typo in driver name Input: xpad - add custom init packet for Xbox One S controllers Input: evdev - call input_flush_device() on release(), not flush() Input: usbtouchscreen - add support for BonXeon TP drivers: net: hamradio: Fix suspicious RCU usage warning in bpqether.c samples: bpf: Fix build error csky: Fixup raw_copy_from_user() cifs: Fix null pointer check in cifs_read hwmon: (nct7904) Fix incorrect range of temperature limit registers csky: Fixup remove duplicate irq_disable csky: Fixup perf callchain unwind csky: Fixup msa highest 3 bits mask clk: ti: am33xx: fix RTC clock parent riscv: stacktrace: Fix undefined reference to `walk_stackframe' IB/i40iw: Remove bogus call to netdev_master_upper_dev_get() net: freescale: select CONFIG_FIXED_PHY where needed usb: gadget: legacy: fix redundant initialization warnings usb: phy: twl6030-usb: Fix a resource leak in an error handling path in 'twl6030_usb_probe()' usb: dwc3: pci: Enable extcon driver for Intel Merrifield cachefiles: Fix race between read_waiter and read_copier involving op->to_do drm/amdgpu: Use GEM obj reference for KFD BOs drm/amd/powerplay: perform PG ungate prior to CG ungate drm/amdgpu: drop unnecessary cancel_delayed_work_sync on PG ungate gfs2: Grab glock reference sooner in gfs2_add_revoke gfs2: move privileged user check to gfs2_quota_lock_check net: microchip: encx24j600: add missed kthread_stop ALSA: usb-audio: add mapping for ASRock TRX40 Creator gpio: tegra: mask GPIO IRQs during IRQ shutdown ARM: dts: rockchip: fix pinctrl sub nodename for spi in rk322x.dtsi ARM: dts: rockchip: swap clock-names of gpu nodes arm64: dts: rockchip: swap interrupts interrupt-names rk3399 gpu node arm64: dts: rockchip: fix status for &gmac2phy in rk3328-evb.dts ARM: dts: rockchip: fix phy nodename for rk3229-xms6 ARM: dts: rockchip: fix phy nodename for rk3228-evb mlxsw: spectrum: Fix use-after-free of split/unsplit/type_set in case reload fails net/mlx4_core: fix a memory leak bug. net: sun: fix missing release regions in cas_init_one(). net/tls: free record only on encryption error net/tls: fix encryption error checking net/mlx5: Annotate mutex destroy for root ns net/mlx5: Fix error flow in case of function_setup failure net/mlx5e: Update netdev txq on completions during closure net/mlx5: Fix memory leak in mlx5_events_init net/mlx5e: Fix inner tirs handling net/mlx5e: kTLS, Destroy key object after destroying the TIS tipc: block BH before using dst_cache sctp: Start shutdown on association restart if in SHUTDOWN-SENT state and socket is closed sctp: Don't add the shutdown timer if its already been added r8152: support additional Microsoft Surface Ethernet Adapter variant nexthop: Fix attribute checking for groups net/tls: fix race condition causing kernel panic net sched: fix reporting the first-time use timestamp net: revert "net: get rid of an signed integer overflow in ip_idents_reserve()" net: qrtr: Fix passing invalid reference to qrtr_local_enqueue() net: nlmsg_cancel() if put fails for nhmsg net: mvpp2: fix RX hashing for non-10G ports net/mlx5: Add command entry handling completion net: ipip: fix wrong address family in init error path net: inet_csk: Fix so_reuseport bind-address cache in tb->fast* __netif_receive_skb_core: pass skb by reference net: ethernet: ti: cpsw: fix ASSERT_RTNL() warning during suspend net: dsa: mt7530: fix roaming from DSA user ports net: don't return invalid table id error when we fall back to PF_UNSPEC dpaa_eth: fix usage as DSA master, try 3 ax25: fix setsockopt(SO_BINDTODEVICE) ANDROID: GKI: enable CONFIG_USB_DUMMY_HCD FROMGIT: USB: dummy-hcd: use configurable endpoint naming scheme ANDROID: GKI: enable a bunch of HID config options =y UPSTREAM: usb: raw-gadget: fix null-ptr-deref when reenabling endpoints UPSTREAM: usb: raw-gadget: documentation updates UPSTREAM: usb: raw-gadget: support stalling/halting/wedging endpoints UPSTREAM: usb: raw-gadget: fix gadget endpoint selection UPSTREAM: usb: raw-gadget: improve uapi headers comments UPSTREAM: usb: raw-gadget: fix return value of ep read ioctls UPSTREAM: usb: raw-gadget: fix raw_event_queue_fetch locking UPSTREAM: usb: raw-gadget: Fix copy_to/from_user() checks ANDROID: GKI: update abi definitions after enabling PCIEPORTBUS Revert "ANDROID: gki_defconfig: Drop CONFIG_PCIEPORTBUS" ANDROID: net: bpf: permit redirect from ingress L3 to egress L2 devices at near max mtu ANDROID: GKI: update abi definitions now that sdcardfs is gone Revert "ANDROID: sdcardfs: Enable modular sdcardfs" ANDROID: remove sdcardfs-needed exports from whitelist Revert "ANDROID: vfs: Add setattr2 for filesystems with per mount permissions" Revert "ANDROID: vfs: Add permission2 for filesystems with per mount permissions" Revert "ANDROID: vfs: add d_canonical_path for stacked filesystem support" Revert "ANDROID: fs: Restore vfs_path_lookup() export" ANDROID: sdcardfs: remove sdcardfs from system FROMGIT: driver core: Update device link status correctly for SYNC_STATE_ONLY links UPSTREAM: driver core: Fix handling of SYNC_STATE_ONLY + STATELESS device links UPSTREAM: driver core: Fix SYNC_STATE_ONLY device link implementation Revert "ANDROID: Incremental fs: Avoid continually recalculating hashes" ANDROID: remove unused variable Linux 5.4.43 sched/fair: Fix enqueue_task_fair() warning some more sched/fair: Fix reordering of enqueue/dequeue_task_fair() sched/fair: Reorder enqueue/dequeue_task_fair path tpm: check event log version before reading final events rxrpc: Fix ack discard rxrpc: Trace discarded ACKs iio: adc: stm32-dfsdm: fix device used to request dma iio: adc: stm32-dfsdm: Use dma_request_chan() instead dma_request_slave_channel() iio: adc: stm32-adc: fix device used to request dma iio: adc: stm32-adc: Use dma_request_chan() instead dma_request_slave_channel() x86/unwind/orc: Fix unwind_get_return_address_ptr() for inactive tasks flow_dissector: Drop BPF flow dissector prog ref on netns cleanup s390/kexec_file: fix initrd location for kdump kernel rxrpc: Fix a memory leak in rxkad_verify_response() rxrpc: Fix the excessive initial retransmission timeout kasan: disable branch tracing for core runtime rapidio: fix an error in get_user_pages_fast() error handling device-dax: don't leak kernel memory to user space after unloading kmem s390/kaslr: add support for R_390_JMP_SLOT relocation type s390/pci: Fix s390_mmio_read/write with MIO ipack: tpci200: fix error return code in tpci200_register() mei: release me_cl object reference tty: serial: add missing spin_lock_init for SiFive serial console misc: rtsx: Add short delay after exit from ASPM iio: adc: ti-ads8344: Fix channel selection iio: dac: vf610: Fix an error handling path in 'vf610_dac_probe()' iio: sca3000: Remove an erroneous 'get_device()' staging: greybus: Fix uninitialized scalar variable staging: kpc2000: fix error return code in kp2000_pcie_probe() staging: iio: ad2s1210: Fix SPI reading media: fdp1: Fix R-Car M3-N naming in debug message Revert "gfs2: Don't demote a glock until its revokes are written" kbuild: Remove debug info from kallsyms linking bpf: Avoid setting bpf insns pages read-only when prog is jited powerpc/64s: Disable STRICT_KERNEL_RWX powerpc: Remove STRICT_KERNEL_RWX incompatibility with RELOCATABLE drm/i915: Propagate error from completed fences drm/i915/gvt: Init DPLL/DDI vreg for virtual display instead of inheritance. vsprintf: don't obfuscate NULL and error pointers dmaengine: owl: Use correct lock in owl_dma_get_pchan() dmaengine: dmatest: Restore default for channel drm/etnaviv: Fix a leak in submit_pin_objects() dmaengine: tegra210-adma: Fix an error handling path in 'tegra_adma_probe()' apparmor: Fix aa_label refcnt leak in policy_update apparmor: fix potential label refcnt leak in aa_change_profile apparmor: Fix use-after-free in aa_audit_rule_init drm/etnaviv: fix perfmon domain interation arm64: Fix PTRACE_SYSEMU semantics scsi: target: Put lun_ref at end of tmr processing scsi: qla2xxx: Do not log message when reading port speed via sysfs ALSA: hda/realtek - Add more fixup entries for Clevo machines ALSA: hda/realtek - Fix silent output on Gigabyte X570 Aorus Xtreme ALSA: pcm: fix incorrect hw_base increase ALSA: iec1712: Initialize STDSP24 properly when using the model=staudio option KVM: x86: Fix pkru save/restore when guest CR4.PKE=0, move it to x86.c ALSA: hda/realtek: Enable headset mic of ASUS UX581LV with ALC295 ALSA: hda/realtek - Enable headset mic of ASUS UX550GE with ALC295 ALSA: hda/realtek - Enable headset mic of ASUS GL503VM with ALC295 ALSA: hda/realtek: Add quirk for Samsung Notebook ALSA: hda/realtek - Add HP new mute led supported for ALC236 ALSA: hda/realtek - Add supported new mute Led for HP ALSA: hda: Manage concurrent reg access more properly ALSA: hda: patch_realtek: fix empty macro usage in if block ALSA: hda - constify and cleanup static NodeID tables scripts/gdb: repair rb_first() and rb_last() ARM: futex: Address build warning KVM: selftests: Fix build for evmcs.h drm/amd/display: Prevent dpcd reads with passive dongles iommu/amd: Call domain_flush_complete() in update_domain() platform/x86: asus-nb-wmi: Do not load on Asus T100TA and T200TA USB: core: Fix misleading driver bug report stmmac: fix pointer check after utilization in stmmac_interrupt ceph: fix double unlock in handle_cap_export() HID: quirks: Add HID_QUIRK_NO_INIT_REPORTS quirk for Dell K12A keyboard-dock gtp: set NLM_F_MULTI flag in gtp_genl_dump_pdp() x86/apic: Move TSC deadline timer debug printk ftrace/selftest: make unresolved cases cause failure if --fail-unresolved set ibmvnic: Skip fatal error reset after passive init x86/mm/cpa: Flush direct map alias during cpa HID: i2c-hid: reset Synaptics SYNA2393 on resume scsi: ibmvscsi: Fix WARN_ON during event pool release net/ena: Fix build warning in ena_xdp_set() component: Silence bind error on -EPROBE_DEFER aquantia: Fix the media type of AQC100 ethernet controller in the driver vhost/vsock: fix packet delivery order to monitoring devices configfs: fix config_item refcnt leak in configfs_rmdir() scsi: qla2xxx: Delete all sessions before unregister local nvme port scsi: qla2xxx: Fix hang when issuing nvme disconnect-all in NPIV HID: alps: ALPS_1657 is too specific; use U1_UNICORN_LEGACY instead HID: alps: Add AUI1657 device ID HID: multitouch: add eGalaxTouch P80H84 support gcc-common.h: Update for GCC 10 net: drop_monitor: use IS_REACHABLE() to guard net_dm_hw_report() kbuild: avoid concurrency issue in parallel building dtbs and dtbs_check mtd: Fix mtd not registered due to nvmem name collision afs: Don't unlock fetched data pages until the op completes successfully ubi: Fix seq_file usage in detailed_erase_block_info debugfs file i2c: mux: demux-pinctrl: Fix an error handling path in 'i2c_demux_pinctrl_probe()' evm: Fix a small race in init_desc() iommu/amd: Fix over-read of ACPI UID from IVRS table i2c: fix missing pm_runtime_put_sync in i2c_device_probe ubifs: remove broken lazytime support fix multiplication overflow in copy_fdtable() mtd: spinand: Propagate ECC information to the MTD structure ACPI: EC: PM: Avoid flushing EC work when EC GPE is inactive ubifs: fix wrong use of crypto_shash_descsize() ima: Fix return value of ima_write_policy() evm: Check also if *tfm is an error pointer in init_desc() ima: Set file->f_mode instead of file->f_flags in ima_calc_file_hash() KVM: SVM: Fix potential memory leak in svm_cpu_init() i2c: dev: Fix the race between the release of i2c_dev and cdev ANDROID: scsi: ufs: Handle clocks when lrbp fails ANDROID: ABI/Whitelist: add erofs whitelist to unisoc whitelist ANDROID: GKI: Update abi for 5.4.42 update UPSTREAM: serial: samsung: 32-bit access for TX/RX hold registers BACKPORT: serial: samsung: dt-bindings: Add reg-io-width compatible UPSTREAM: serial: samsung: Replace rd_regb/wr_regb with rd_reg/wr_reg ANDROID: fscrypt: handle direct I/O with IV_INO_LBLK_32 BACKPORT: FROMLIST: fscrypt: add support for IV_INO_LBLK_32 policies Linux 5.4.42 bpf: Test_progs, fix test_get_stack_rawtp_err.c build selftest/bpf: fix backported test_select_reuseport selftest changes libbpf: Extract and generalize CPU mask parsing logic Makefile: disallow data races on gcc-10 as well KVM: x86: Fix off-by-one error in kvm_vcpu_ioctl_x86_setup_mce bpf: Fix sk_psock refcnt leak when receiving message SUNRPC: Revert241b1f419f("SUNRPC: Remove xdr_buf_trim()") ARM: dts: r8a7740: Add missing extal2 to CPG node arm64: dts: renesas: r8a77980: Fix IPMMU VIP[01] nodes ARM: dts: r8a73a4: Add missing CMT1 interrupts arm64: dts: imx8mn: Change SDMA1 ahb clock for imx8mn arm64: dts: rockchip: Rename dwc3 device nodes on rk3399 to make dtc happy arm64: dts: rockchip: Replace RK805 PMIC node name with "pmic" on rk3328 boards arm64: dts: meson-g12-common: fix dwc2 clock names arm64: dts: meson-g12b-khadas-vim3: add missing frddr_a status property clk: Unlink clock if failed to prepare or enable Revert "ALSA: hda/realtek: Fix pop noise on ALC225" usb: gadget: legacy: fix error return code in cdc_bind() usb: gadget: legacy: fix error return code in gncm_bind() usb: gadget: audio: Fix a missing error return value in audio_bind() usb: gadget: net2272: Fix a memory leak in an error handling path in 'net2272_plat_probe()' fanotify: fix merging marks masks with FAN_ONDIR dwc3: Remove check for HWO flag in dwc3_gadget_ep_reclaim_trb_sg() clk: rockchip: fix incorrect configuration of rk3228 aclk_gpu* clocks exec: Move would_dump into flush_old_exec x86/unwind/orc: Fix error handling in __unwind_start() x86: Fix early boot crash on gcc-10, third try cifs: fix leaked reference on requeued write powerpc/32s: Fix build failure with CONFIG_PPC_KUAP_DEBUG drm/amd/display: add basic atomic check for cursor plane ARM: dts: imx6dl-yapp4: Fix Ursa board Ethernet connection ARM: dts: imx27-phytec-phycard-s-rdk: Fix the I2C1 pinctrl entries ARM: dts: dra7: Fix bus_dma_limit for PCIe Make the "Reducing compressed framebufer size" message be DRM_INFO_ONCE() usb: xhci: Fix NULL pointer dereference when enqueuing trbs from urb sg list USB: gadget: fix illegal array access in binding with UDC usb: cdns3: gadget: prev_req->trb is NULL for ep0 usb: host: xhci-plat: keep runtime active when removing host usb: core: hub: limit HUB_QUIRK_DISABLE_AUTOSUSPEND to USB5534B ALSA: usb-audio: Add control message quirk delay for Kingston HyperX headset ALSA: rawmidi: Fix racy buffer resize under concurrent accesses ALSA: hda/realtek - Add COEF workaround for ASUS ZenBook UX431DA ALSA: hda/realtek - Limit int mic boost for Thinkpad T530 USB: usbfs: fix mmap dma mismatch usb: usbfs: correct kernel->user page attribute mismatch gcc-10: avoid shadowing standard library 'free()' in crypto gcc-10: mark more functions __init to avoid section mismatch warnings gcc-10 warnings: fix low-hanging fruit gcc-10: disable 'restrict' warning for now gcc-10: disable 'stringop-overflow' warning for now gcc-10: disable 'array-bounds' warning for now gcc-10: disable 'zero-length-bounds' warning for now Stop the ad-hoc games with -Wno-maybe-initialized net/rds: Use ERR_PTR for rds_message_alloc_sgs() pnp: Use list_for_each_entry() instead of open coding NFSv3: fix rpc receive buffer size for MOUNT call mm, memcg: fix inconsistent oom event behavior s390/ism: fix error return code in ism_probe() hwmon: (da9052) Synchronize access with mfd RDMA/iw_cxgb4: Fix incorrect function parameters RDMA/core: Fix double put of resource IB/core: Fix potential NULL pointer dereference in pkey cache IB/mlx4: Test return value of calls to ib_get_cached_pkey RDMA/rxe: Always return ERR_PTR from rxe_create_mmap_info() netfilter: nft_set_rbtree: Add missing expired checks netfilter: nft_set_rbtree: Introduce and use nft_rbtree_interval_start() SUNRPC: Signalled ASYNC tasks need to exit nfs: fix NULL deference in nfs4_get_valid_delegation arm64: fix the flush_icache_range arguments in machine_kexec drm/i915/gvt: Fix kernel oops for 3-level ppgtt guest netfilter: conntrack: avoid gcc-10 zero-length-bounds warning NFSv4: Fix fscache cookie aux_data to ensure change_attr is included nfs: fscache: use timespec64 in inode auxdata NFS: Fix fscache super_cookie index_key from changing after umount drm/amdgpu: force fbdev into vram fork: prevent accidental access to clone3 features gfs2: More gfs2_find_jhead fixes mmc: block: Fix request completion in the CQE timeout path mmc: core: Fix recursive locking issue in CQE recovery path mmc: core: Check request type before completing the request mmc: sdhci-pci-gli: Fix can not access GL9750 after reboot from Windows 10 mmc: alcor: Fix a resource leak in the error path for ->probe() bpf, sockmap: bpf_tcp_ingress needs to subtract bytes from sg.size bpf, sockmap: msg_pop_data can incorrecty set an sge length drm/i915: Don't enable WaIncreaseLatencyIPCEnabled when IPC is disabled i40iw: Fix error handling in i40iw_manage_arp_cache() ALSA: firewire-lib: fix 'function sizeof not defined' error of tracepoints format bpf: Fix error return code in map_lookup_and_delete_elem() pinctrl: cherryview: Add missing spinlock usage in chv_gpio_irq_handler pinctrl: qcom: fix wrong write in update_dual_edge pinctrl: baytrail: Enable pin configuration setting for GPIO chip pinctrl: sunrisepoint: Fix PAD lock register offset for SPT-H ACPI: EC: PM: Avoid premature returns from acpi_s2idle_wake() IB/hfi1: Fix another case where pq is left on waitlist mmc: sdhci-pci-gli: Fix no irq handler from suspend gfs2: Another gfs2_walk_metadata fix ALSA: hda/realtek - Fix S3 pop noise on Dell Wyse ipc/util.c: sysvipc_find_ipc() incorrectly updates position index drm/amdgpu: invalidate L2 before SDMA IBs (v2) drm/amdgpu: simplify padding calculations (v2) drm/qxl: lost qxl_bo_kunmap_atomic_page in qxl_image_init_helper() drm/amd/display: Update downspread percent to match spreadsheet for DCN2.1 drm/amd/display: check if REFCLK_CNTL register is present drm/amd/powerplay: avoid using pm_en before it is initialized revised ALSA: hda/hdmi: fix race in monitor detection during probe cpufreq: intel_pstate: Only mention the BIOS disabling turbo mode once selftests/ftrace: Check the first record for kprobe_args_type.tc dmaengine: mmp_tdma: Reset channel error on release dmaengine: mmp_tdma: Do not ignore slave config validation errors dmaengine: pch_dma.c: Avoid data race between probe and irq handler riscv: fix vdso build with lld umh: fix memory leak on execve failure r8169: re-establish support for RTL8401 chip version nfp: abm: fix error return code in nfp_abm_vnic_alloc() net: tcp: fix rx timestamp behavior for tcp_recvmsg netprio_cgroup: Fix unlimited memory leak of v2 cgroups net: ipv4: really enforce backoff for redirects net: dsa: loop: Add module soft dependency hinic: fix a bug of ndo_stop dpaa2-eth: prevent array underflow in update_cls_rule() virtio_net: fix lockdep warning on 32 bit tcp: fix SO_RCVLOWAT hangs with fat skbs tcp: fix error recovery in tcp_zerocopy_receive() Revert "ipv6: add mtu lock check in __ip6_rt_update_pmtu" pppoe: only process PADT targeted at local interfaces net: stmmac: fix num_por initialization net: phy: fix aneg restart in phy_ethtool_set_eee netlabel: cope with NULL catmap net: fix a potential recursive NETDEV_FEAT_CHANGE dpaa2-eth: properly handle buffer size restrictions mmc: sdhci-acpi: Add SDHCI_QUIRK2_BROKEN_64_BIT_DMA for AMDI0040 selftests/bpf: fix goto cleanup label not defined scsi: sg: add sg_remove_request in sg_write net_sched: fix tcm_parent in tc filter dump sun6i: dsi: fix gcc-4.8 virtio-blk: handle block_device_operations callbacks after hot unplug drop_monitor: work around gcc-10 stringop-overflow warning ftrace/selftests: workaround cgroup RT scheduling issues net: moxa: Fix a potential double 'free_irq()' net/sonic: Fix a resource leak in an error handling path in 'jazz_sonic_probe()' SUNRPC: Fix GSS privacy computation of auth->au_ralign SUNRPC: Add "@len" parameter to gss_unwrap() gpio: pca953x: Fix pca953x_gpio_set_config KVM: arm: vgic: Synchronize the whole guest on GIC{D,R}_I{S,C}ACTIVER read net: phy: microchip_t1: add lan87xx_phy_init to initialize the lan87xx phy. shmem: fix possible deadlocks on shmlock_user_lock net: dsa: Do not make user port errors fatal f2fs: flush dirty meta pages when flushing them f2fs: fix checkpoint=disable:%u%% f2fs: rework filename handling f2fs: split f2fs_d_compare() from f2fs_match_name() f2fs: don't leak filename in f2fs_try_convert_inline_dir() ANDROID: clang: update to 11.0.1 FROMLIST: x86_64: fix jiffies ODR violation ANDROID: ABI/Whitelist: add ufs whitelist to unisoc whitelist ANDROID: GKI: Enable net testing options ANDROID: fscrypt: set dun_bytes more precisely ANDROID: dm-default-key: set dun_bytes more precisely ANDROID: block: backport the ability to specify max_dun_bytes ANDROID: Incremental fs: wake up log pollers less often ANDROID: Incremental fs: Fix scheduling while atomic error ANDROID: Incremental fs: Avoid continually recalculating hashes ANDROID: export: Disable symbol trimming on modules ANDROID: ABI/Whitelist: add the symbol sdhci_request_atomic to unisoc whitelist FROMGIT: media: uapi: h264: Add new profile and levels FROMGIT: media: v4l2-ctrl: Add H264 profile and levels ANDROID: GKI: abi update due to mmc patches merged FROMGIT: mmc: host: sdhci-sprd: Implement the request_atomic() API FROMGIT: mmc: host: sdhci: Implement the request_atomic() API FROMGIT: mmc: host: Introduce the request_atomic() for the host FROMGIT: mmc: sdhci: Reduce maximum time under spinlock in sdhci_send_command() FROMGIT: mmc: sdhci: Tidy sdhci_request() a bit FROMGIT: mmc: sdhci: Remove unneeded forward declaration of sdhci_finish_data() FROMGIT: mmc: sdhci: Stop exporting sdhci_send_command() FROMGIT: mmc: sdhci: Add helpers for the auto-CMD23 flag FROMGIT: mmc: sdhci-sprd: Drop redundant cap flags ANDROID: GKI: update abi definition due to 5.4.41 merge Linux 5.4.41 fanotify: merge duplicate events on parent and child fsnotify: replace inode pointer with an object id bdi: add a ->dev_name field to struct backing_dev_info bdi: move bdi_dev_name out of line mm, memcg: fix error return value of mem_cgroup_css_alloc() scripts/decodecode: fix trapping instruction formatting iommu/virtio: Reverse arguments to list_add objtool: Fix stack offset tracking for indirect CFAs netfilter: nf_osf: avoid passing pointer to local var netfilter: nat: never update the UDP checksum when it's 0 arch/x86/kvm/svm/sev.c: change flag passed to GUP fast in sev_pin_memory() KVM: x86: Fixes posted interrupt check for IRQs delivery modes x86/unwind/orc: Fix premature unwind stoppage due to IRET frames x86/unwind/orc: Fix error path for bad ORC entry type x86/unwind/orc: Prevent unwinding before ORC initialization x86/unwind/orc: Don't skip the first frame for inactive tasks x86/entry/64: Fix unwind hints in rewind_stack_do_exit() x86/entry/64: Fix unwind hints in kernel exit path x86/entry/64: Fix unwind hints in register clearing code batman-adv: Fix refcnt leak in batadv_v_ogm_process batman-adv: Fix refcnt leak in batadv_store_throughput_override batman-adv: Fix refcnt leak in batadv_show_throughput_override batman-adv: fix batadv_nc_random_weight_tq iocost: protect iocg->abs_vdebt with iocg->waitq.lock riscv: set max_pfn to the PFN of the last page coredump: fix crash when umh is disabled staging: gasket: Check the return value of gasket_get_bar_index() ceph: demote quotarealm lookup warning to a debug message ceph: fix endianness bug when handling MDS session feature bits mm: limit boost_watermark on small zones mm/page_alloc: fix watchdog soft lockups during set_zone_contiguous() eventpoll: fix missing wakeup for ovflist in ep_poll_callback epoll: atomically remove wait entry on wake up ipc/mqueue.c: change __do_notify() to bypass check_kill_permission() drm: ingenic-drm: add MODULE_DEVICE_TABLE arm64: hugetlb: avoid potential NULL dereference KVM: arm64: Fix 32bit PC wrap-around KVM: arm: vgic: Fix limit condition when writing to GICD_I[CS]ACTIVER KVM: VMX: Explicitly clear RFLAGS.CF and RFLAGS.ZF in VM-Exit RSB path KVM: s390: Remove false WARN_ON_ONCE for the PQAP instruction crypto: arch/nhpoly1305 - process in explicit 4k chunks tracing: Add a vmalloc_sync_mappings() for safe measure USB: serial: garmin_gps: add sanity checking for data length usb: chipidea: msm: Ensure proper controller reset using role switch API USB: uas: add quirk for LaCie 2Big Quadra HID: wacom: Report 2nd-gen Intuos Pro S center button status over BT HID: usbhid: Fix race between usbhid_close() and usbhid_stop() Revert "HID: wacom: generic: read the number of expected touches on a per collection basis" sctp: Fix bundling of SHUTDOWN with COOKIE-ACK HID: wacom: Read HID_DG_CONTACTMAX directly for non-generic devices net: mvpp2: cls: Prevent buffer overflow in mvpp2_ethtool_cls_rule_del() net: mvpp2: prevent buffer overflow in mvpp22_rss_ctx() net/mlx5: Fix command entry leak in Internal Error State net/mlx5: Fix forced completion access non initialized command entry net/mlx5: DR, On creation set CQ's arm_db member to right value bnxt_en: Fix VLAN acceleration handling in bnxt_fix_features(). bnxt_en: Return error when allocating zero size context memory. bnxt_en: Improve AER slot reset. bnxt_en: Reduce BNXT_MSIX_VEC_MAX value to supported CQs per PF. bnxt_en: Fix VF anti-spoof filter setup. tunnel: Propagate ECT(1) when decapsulating as recommended by RFC6040 tipc: fix partial topology connection closure sch_sfq: validate silly quantum values sch_choke: avoid potential panic in choke_reset() nfp: abm: fix a memory leak bug net: usb: qmi_wwan: add support for DW5816e net/tls: Fix sk_psock refcnt leak when in tls_data_ready() net/tls: Fix sk_psock refcnt leak in bpf_exec_tx_verdict() net: tc35815: Fix phydev supported/advertising mask net: stricter validation of untrusted gso packets net_sched: sch_skbprio: add message validation to skbprio_change() net/mlx4_core: Fix use of ENOSPC around mlx4_counter_alloc() net: macsec: preserve ingress frame ordering net: macb: fix an issue about leak related system resources net: dsa: Do not leave DSA master with NULL netdev_ops neigh: send protocol value in neighbor create notification mlxsw: spectrum_acl_tcam: Position vchunk in a vregion list properly ipv6: Use global sernum for dst validation with nexthop objects fq_codel: fix TCA_FQ_CODEL_DROP_BATCH_SIZE sanity checks dp83640: reverse arguments to list_add_tail devlink: fix return value after hitting end in region read tty: xilinx_uartps: Fix missing id assignment to the console vt: fix unicode console freeing with a common interface drm/amdgpu: drop redundant cg/pg ungate on runpm enter drm/amdgpu: move kfd suspend after ip_suspend_phase1 net: macb: Fix runtime PM refcounting tracing/kprobes: Fix a double initialization typo nvme: fix possible hang when ns scanning fails during error recovery nvme: refactor nvme_identify_ns_descs error handling USB: serial: qcserial: Add DW5816e support ANDROID: GKI: enable CONFIG_IRQ_TIME_ACCOUNTING ANDROID: GKI: Enable CONFIG_STATIC_USERMODEHELPER ANDROID: dm-default-key: Update key size for wrapped keys ANDROID: GKI: x86: Drop CONFIG_DEVPORT Linux 5.4.40 PM / devfreq: Add missing locking while setting suspend_freq udp: document udp_rcv_segment special case for looped packets tools headers UAPI: Sync copy of arm64's asm/unistd.h with the kernel sources Revert "drm/amd/display: setting the DIG_MODE to the correct value." mm/mremap: Add comment explaining the untagging behaviour of mremap() libbpf: Fix readelf output parsing for Fedora cgroup, netclassid: remove double cond_resched mac80211: add ieee80211_is_any_nullfunc() ACPI: PM: s2idle: Fix comment in acpi_s2idle_prepare_late() platform/x86: GPD pocket fan: Fix error message when temp-limits are out of range x86/kvm: fix a missing-prototypes "vmread_error" ALSA: hda: Match both PCI ID and SSID for driver blacklist hexagon: define ioremap_uc hexagon: clean up ioremap mfd: intel-lpss: Use devm_ioremap_uc for MMIO lib: devres: add a helper function for ioremap_uc Revert "software node: Simplify software_node_release() function" drm/amdgpu: Fix oops when pp_funcs is unset in ACPI event sctp: Fix SHUTDOWN CTSN Ack in the peer restart case drm/i915: Extend WaDisableDARBFClkGating to icl,ehl,tgl net: systemport: suppress warnings on failed Rx SKB allocations net: bcmgenet: suppress warnings on failed Rx SKB allocations mac80211: sta_info: Add lockdep condition for RCU list usage lib/mpi: Fix building for powerpc with clang tracing: Fix memory leaks in trace_events_hist.c cifs: do not share tcons with DFS scripts/config: allow colons in option strings for sed cifs: protect updating server->dstaddr with a spinlock ASoC: rsnd: Fix "status check failed" spam for multi-SSI ASoC: rsnd: Don't treat master SSI in multi SSI setup as parent net: stmmac: Fix sub-second increment net: stmmac: fix enabling socfpga's ptp_ref_clock wimax/i2400m: Fix potential urb refcnt leak drm/amdgpu: Correctly initialize thermal controller for GPUs with Powerplay table v0 (e.g Hawaii) remoteproc: qcom_q6v5_mss: fix a bug in q6v5_probe() ASoC: codecs: hdac_hdmi: Fix incorrect use of list_for_each_entry ASoC: rsnd: Fix HDMI channel mapping for multi-SSI mode ASoC: rsnd: Fix parent SSI start/stop in multi-SSI mode usb: dwc3: gadget: Properly set maxpacket limit ASoC: topology: Fix endianness issue ASoC: sgtl5000: Fix VAG power-on handling selftests/ipc: Fix test failure seen after initial test run ASoC: topology: Check return value of soc_tplg_dai_config ASoC: topology: Check return value of pcm_new_ver ASoC: topology: Check soc_tplg_add_route return value ASoC: topology: Check return value of soc_tplg_*_create ASoC: topology: Check return value of soc_tplg_create_tlv drm/bridge: analogix_dp: Split bind() into probe() and real bind() vhost: vsock: kick send_pkt worker once device is started ANDROID: GKI: update abi definition due to FAIR_GROUP_SCHED removal ANDROID: GKI: Remove FAIR_GROUP_SCHED ANDROID: Drop ABI monitoring from KASAN build config ANDROID: Enforce KMI stability Linux 5.4.39 selinux: properly handle multiple messages in selinux_netlink_send() arm64: vdso: Add -fasynchronous-unwind-tables to cflags dmaengine: dmatest: Fix process hang when reading 'wait' parameter dmaengine: dmatest: Fix iteration non-stop logic nfs: Fix potential posix_acl refcnt leak in nfs3_set_acl nvme: prevent double free in nvme_alloc_ns() error handling Fix use after free in get_tree_bdev() ALSA: opti9xx: shut up gcc-10 range warning i2c: aspeed: Avoid i2c interrupt status clear race condition. iommu/amd: Fix legacy interrupt remapping for x2APIC-enabled system scsi: target/iblock: fix WRITE SAME zeroing iommu/qcom: Fix local_base status check vfio/type1: Fix VA->PA translation for PFNMAP VMAs in vaddr_get_pfn() vfio: avoid possible overflow in vfio_iommu_type1_pin_pages i2c: iproc: generate stop event for slave writes RDMA/cm: Fix an error check in cm_alloc_id_priv() RDMA/cm: Fix ordering of xa_alloc_cyclic() in ib_create_cm_id() RDMA/core: Fix race between destroy and release FD object RDMA/core: Prevent mixed use of FDs between shared ufiles RDMA/siw: Fix potential siw_mem refcnt leak in siw_fastreg_mr() RDMA/mlx4: Initialize ib_spec on the stack RDMA/mlx5: Set GRH fields in query QP on RoCE scsi: qla2xxx: check UNLOADING before posting async work scsi: qla2xxx: set UNLOADING before waiting for session deletion ARM: dts: imx6qdl-sr-som-ti: indicate powering off wifi is safe dm multipath: use updated MPATHF_QUEUE_IO on mapping for bio-based mpath dm writecache: fix data corruption when reloading the target dm verity fec: fix hash block number in verity_fec_decode PM: hibernate: Freeze kernel threads in software_resume() PM: ACPI: Output correct message on target power state IB/rdmavt: Always return ERR_PTR from rvt_create_mmap_info() dlmfs_file_write(): fix the bogosity in handling non-zero *ppos Drivers: hv: vmbus: Fix Suspend-to-Idle for Generation-2 VM i2c: amd-mp2-pci: Fix Oops in amd_mp2_pci_init() error handling ALSA: pcm: oss: Place the plugin buffer overflow checks correctly ALSA: line6: Fix POD HD500 audio playback ALSA: hda/hdmi: fix without unlocked before return ALSA: usb-audio: Correct a typo of NuPrime DAC-10 USB ID ALSA: hda/realtek - Two front mics on a Lenovo ThinkCenter crypto: caam - fix the address of the last entry of S/G mmc: meson-mx-sdio: remove the broken ->card_busy() op mmc: meson-mx-sdio: Set MMC_CAP_WAIT_WHILE_BUSY mmc: sdhci-msm: Enable host capabilities pertains to R1b response mmc: sdhci-pci: Fix eMMC driver strength for BYT-based controllers mmc: sdhci-xenon: fix annoying 1.8V regulator warning mmc: cqhci: Avoid false "cqhci: CQE stuck on" by not open-coding timeout loop btrfs: transaction: Avoid deadlock due to bad initialization timing of fs_info::journal_info btrfs: fix partial loss of prealloc extent past i_size after fsync btrfs: fix block group leak when removing fails btrfs: fix transaction leak in btrfs_recover_relocation NFSv4.1: fix handling of backchannel binding in BIND_CONN_TO_SESSION drm/qxl: qxl_release use after free drm/qxl: qxl_release leak in qxl_hw_surface_alloc() drm/qxl: qxl_release leak in qxl_draw_dirty_fb() drm/amd/display: Fix green screen issue after suspend drm/edid: Fix off-by-one in DispID DTD pixel clock dma-buf: Fix SET_NAME ioctl uapi ANDROID: Rename build.config.gki.arch_kasan ANDROID: Incremental fs: Fix issues with very large files ANDROID: Correct build.config branch name FROMGIT: f2fs: fix missing check for f2fs_unlock_op ANDROID: Fix build.config.gki-debug UPSTREAM: vdso: Fix clocksource.h macro detection Linux 5.4.38 Revert "ASoC: meson: axg-card: fix codec-to-codec link setup" ANDROID: GKI: update abi definition due to added padding ANDROID: GKI: user_namespace.h: add Android ABI padding to a structure ANDROID: GKI: timer.h: add Android ABI padding to a structure ANDROID: GKI: quota.h: add Android ABI padding to some structures ANDROID: GKI: mmu_notifier.h: add Android ABI padding to some structures ANDROID: GKI: mm.h: add Android ABI padding to a structure ANDROID: GKI: kobject.h: add Android ABI padding to some structures ANDROID: GKI: kernfs.h: add Android ABI padding to some structures ANDROID: GKI: irqdomain.h: add Android ABI padding to a structure ANDROID: GKI: ioport.h: add Android ABI padding to a structure ANDROID: GKI: iomap.h: add Android ABI padding to a structure ANDROID: GKI: hrtimer.h: add Android ABI padding to a structure ANDROID: GKI: genhd.h: add Android ABI padding to some structures ANDROID: GKI: ethtool.h: add Android ABI padding to a structure ANDROID: GKI: dma-mapping.h: add Android ABI padding to a structure ANDROID: GKI: sched: add Android ABI padding to some structures ANDROID: GKI: networking: add Android ABI padding to a lot of networking structures ANDROID: GKI: blk_types.h: add Android ABI padding to a structure ANDROID: GKI: scsi.h: add Android ABI padding to a structure ANDROID: GKI: pci: add Android ABI padding to some structures ANDROID: GKI: update abi definition due to 5.4.37 merge Linux 5.4.37 ASoC: stm32: spdifrx: fix regmap status check ASoC: soc-core: disable route checks for legacy devices ext4: check for non-zero journal inum in ext4_calculate_overhead qed: Fix use after free in qed_chain_free net: use indirect call wrappers for skb_copy_datagram_iter() Crypto: chelsio - Fixes a hang issue during driver registration qed: Fix race condition between scheduling and destroying the slowpath workqueue taprio: do not use BIT() in TCA_TAPRIO_ATTR_FLAG_* definitions hwmon: (jc42) Fix name to have no illegal characters blk-mq: Put driver tag in blk_mq_dispatch_rq_list() when no budget ext4: convert BUG_ON's to WARN_ON's in mballoc.c ext4: increase wait time needed before reuse of deleted inode numbers ext4: use matching invalidatepage in ext4_writepage arm64: Delete the space separator in __emit_inst mac80211: fix channel switch trigger from unknown mesh peer net: stmmac: socfpga: Allow all RGMII modes ALSA: hda: call runtime_allow() for all hda controllers xen/xenbus: ensure xenbus_map_ring_valloc() returns proper grant status objtool: Support Clang non-section symbols in ORC dump objtool: Fix CONFIG_UBSAN_TRAP unreachable warnings scsi: target: tcmu: reset_ring should reset TCMU_DEV_BIT_BROKEN scsi: target: fix PR IN / READ FULL STATUS for FC ALSA: hda: Explicitly permit using autosuspend if runtime PM is supported ALSA: hda: Keep the controller initialization even if no codecs found ALSA: hda: Release resources at error in delayed probe xfs: fix partially uninitialized structure in xfs_reflink_remap_extent afs: Fix length of dump of bad YFSFetchStatus record signal: check sig before setting info in kill_pid_usb_asyncio x86: hyperv: report value of misc_features net: fec: set GPR bit on suspend by DT configuration. libbpf: Initialize *nl_pid so gcc 10 is happy bpf, x86: Fix encoding for lower 8-bit registers in BPF_STX BPF_B xfs: clear PF_MEMALLOC before exiting xfsaild thread mm: shmem: disable interrupt when acquiring info->lock in userfaultfd_copy path bpf, x86_32: Fix logic error in BPF_LDX zero-extension bpf, x86_32: Fix clobbering of dst for BPF_JSET bpf, x86_32: Fix incorrect encoding in BPF_LDX zero-extension um: ensure `make ARCH=um mrproper` removes arch/$(SUBARCH)/include/generated/ blk-iocost: Fix error on iocost_ioc_vrate_adj PM: sleep: core: Switch back to async_schedule_dev() netfilter: nat: fix error handling upon registering inet hook perf/core: fix parent pid/tid in task exit events sched/core: Fix reset-on-fork from RT with uclamp net/mlx5: Fix failing fw tracer allocation on s390 s390/pci: do not set affinity for floating irqs cpumap: Avoid warning when CONFIG_DEBUG_PER_CPU_MAPS is enabled ARM: dts: bcm283x: Disable dsi0 node PCI: Move Apex Edge TPU class quirk to fix BAR assignment PCI: Add ACS quirk for Zhaoxin Root/Downstream Ports PCI: Add Zhaoxin Vendor ID PCI: Unify ACS quirk desired vs provided checking PCI: Make ACS quirk implementations more uniform PCI: Add ACS quirk for Zhaoxin multi-function devices PCI: Avoid ASMedia XHCI USB PME# from D0 defect net/mlx5e: Get the latest values from counters in switchdev mode net/mlx5e: Don't trigger IRQ multiple times on XSK wakeup to avoid WQ overruns svcrdma: Fix leak of svc_rdma_recv_ctxt objects svcrdma: Fix trace point use-after-free race xfs: acquire superblock freeze protection on eofblocks scans net/cxgb4: Check the return from t4_query_params properly rxrpc: Fix DATA Tx to disable nofrag for UDP on AF_INET6 socket i2c: altera: use proper variable to hold errno bpf: Forbid XADD on spilled pointers for unprivileged users nfsd: memory corruption in nfsd4_lock() drivers: soc: xilinx: fix firmware driver Kconfig dependency ASoC: wm8960: Fix wrong clock after suspend & resume ASoC: meson: axg-card: fix codec-to-codec link setup ASoC: tas571x: disable regulators on failed probe ASoC: q6dsp6: q6afe-dai: add missing channels to MI2S DAIs s390/ftrace: fix potential crashes when switching tracers counter: 104-quad-8: Add lock guards - generic interface propagate_one(): mnt_set_mountpoint() needs mount_lock iio:ad7797: Use correct attribute_group afs: Fix to actually set AFS_SERVER_FL_HAVE_EPOCH afs: Make record checking use TASK_UNINTERRUPTIBLE when appropriate usb: gadget: udc: atmel: Fix vbus disconnect handling usb: gadget: udc: bdc: Remove unnecessary NULL checks in bdc_req_complete kbuild: fix DT binding schema rule again to avoid needless rebuilds usb: dwc3: gadget: Do link recovery for SS and SSP ASoC: stm32: sai: fix sai probe printk: queue wake_up_klogd irq_work only if per-CPU areas are ready ubifs: Fix ubifs_tnc_lookup() usage in do_kill_orphans() remoteproc: Fix wrong rvring index computation ANDROID: Update ABI representation after enabling CONFIG_HID_BATTERY_STRENGTH ANDROID: GKI: enable CONFIG_HID_BATTERY_STRENGTH ANDROID: Update ABI representation after adding exynos whitelist ANDROID: Add abi_gki_aarch64_exynos_whitelist ANDROID: build.config.gki.aarch64: Enable WHITELIST_STRICT_MODE ANDROID: abi_gki_aarch64_sunxi_whitelist: remove stale symbols ANDROID: abi_gki_aarch64_unisoc_whitelist: remove stale symbols ANDROID: abi_gki_aarch64_qcom_whitelist: Sync with android-5.4 ANDROID: abi_gki_aarch64_hikey960_whitelist: remove stale symbols ANDROID: Incremental fs: Add setattr call ANDROID: GKI: enable CONFIG_RTC_SYSTOHC on x86 ANDROID: drivers: gpu: drm: fix export symbol type ANDROID: driver: gpu: drm: fix export symbol types ANDROID: drm: kirin: fix export symbol type ANDROID: iommu: fix export symbol type ANDROID: ion: fix export symbol type ANDROID: mm/memory.c: fix export symbol type ANDROID: sdcardfs: fix export symbol type ANDROID: SoC: core: fix export symbol type ANDROID: ufshcd-crypto: fix export symbol type ANDROID: GKI: update abi and cf/gf whitelists ANDROID: GKI: enable CONFIG_RTC_SYSTOHC ANDROID: virt_wifi: fix export symbol types ANDROID: vfs: fix export symbol type ANDROID: vfs: fix export symbol types ANDROID: fscrypt: fix export symbol type ANDROID: cfi: fix export symbol types ANDROID: bpf: fix export symbol type Linux 5.4.36 s390/mm: fix page table upgrade vs 2ndary address mode accesses compat: ARM64: always include asm-generic/compat.h powerpc/mm: Fix CONFIG_PPC_KUAP_DEBUG on PPC32 powerpc/kuap: PPC_KUAP_DEBUG should depend on PPC_KUAP Revert "serial: uartps: Register own uart console and driver structures" Revert "serial: uartps: Move Port ID to device data structure" Revert "serial: uartps: Change uart ID port allocation" Revert "serial: uartps: Do not allow use aliases >= MAX_UART_INSTANCES" Revert "serial: uartps: Fix error path when alloc failed" Revert "serial: uartps: Use the same dynamic major number for all ports" Revert "serial: uartps: Fix uartps_major handling" serial: sh-sci: Make sure status register SCxSR is read in correct sequence xhci: Don't clear hub TT buffer on ep0 protocol stall xhci: prevent bus suspend if a roothub port detected a over-current condition xhci: Fix handling halted endpoint even if endpoint ring appears empty usb: typec: altmode: Fix typec_altmode_get_partner sometimes returning an invalid pointer usb: typec: tcpm: Ignore CC and vbus changes in PORT_RESET change usb: f_fs: Clear OS Extended descriptor counts to zero in ffs_data_reset() usb: dwc3: gadget: Fix request completion check fpga: dfl: pci: fix return value of cci_pci_sriov_configure UAS: fix deadlock in error handling and PM flushing work UAS: no use logging any details in case of ENODEV cdc-acm: introduce a cool down cdc-acm: close race betrween suspend() and acm_softint staging: vt6656: Power save stop wake_up_count wrap around. staging: vt6656: Fix pairwise key entry save. staging: vt6656: Fix drivers TBTT timing counter. staging: vt6656: Fix calling conditions of vnt_set_bss_mode staging: vt6656: Don't set RCR_MULTICAST or RCR_BROADCAST by default. vt: don't use kmalloc() for the unicode screen buffer vt: don't hardcode the mem allocation upper bound staging: comedi: Fix comedi_device refcnt leak in comedi_open staging: comedi: dt2815: fix writing hi byte of analog output powerpc/setup_64: Set cache-line-size based on cache-block-size ARM: imx: provide v7_cpu_resume() only on ARM_CPU_SUSPEND=y cifs: fix uninitialised lease_key in open_shroot() iwlwifi: mvm: fix inactive TID removal return value usage iwlwifi: mvm: Do not declare support for ACK Enabled Aggregation iwlwifi: mvm: limit maximum queue appropriately iwlwifi: mvm: beacon statistics shouldn't go backwards iwlwifi: pcie: actually release queue memory in TVQM SUNRPC: Fix backchannel RPC soft lockups mac80211: populate debugfs only after cfg80211 init ASoC: dapm: fixup dapm kcontrol widget audit: check the length of userspace generated audit records signal: Avoid corrupting si_pid and si_uid in do_notify_parent usb-storage: Add unusual_devs entry for JMicron JMS566 tty: rocket, avoid OOB access tty: hvc: fix buffer overflow during hvc_alloc(). KVM: VMX: Enable machine check support for 32bit targets KVM: Check validity of resolved slot when searching memslots KVM: s390: Return last valid slot if approx index is out-of-bounds tpm: ibmvtpm: retry on H_CLOSED in tpm_ibmvtpm_send() tpm: fix wrong return value in tpm_pcr_extend tpm/tpm_tis: Free IRQ if probing fails ALSA: usb-audio: Filter out unsupported sample rates on Focusrite devices ALSA: usb-audio: Fix usb audio refcnt leak when getting spdif ALSA: hda/hdmi: Add module option to disable audio component binding ALSA: hda/realtek - Add new codec supported for ALC245 ALSA: hda/realtek - Fix unexpected init_amp override ALSA: usx2y: Fix potential NULL dereference tools/vm: fix cross-compile build mm/ksm: fix NULL pointer dereference when KSM zero page is enabled mm/hugetlb: fix a addressing exception caused by huge_pte_offset coredump: fix null pointer dereference on coredump staging: gasket: Fix incongruency in handling of sysfs entries creation vmalloc: fix remap_vmalloc_range() bounds checks tty: serial: owl: add "much needed" clk_prepare_enable() USB: hub: Revert commitbd0e6c9614("usb: hub: try old enumeration scheme first for high speed devices") USB: hub: Fix handling of connect changes during sleep USB: core: Fix free-while-in-use bug in the USB S-Glibrary USB: early: Handle AMD's spec-compliant identifiers, too USB: Add USB_QUIRK_DELAY_CTRL_MSG and USB_QUIRK_DELAY_INIT for Corsair K70 RGB RAPIDFIRE USB: sisusbvga: Change port variable from signed to unsigned iio: xilinx-xadc: Make sure not exceed maximum samplerate iio: xilinx-xadc: Fix sequencer configuration for aux channels in simultaneous mode iio: xilinx-xadc: Fix clearing interrupt when enabling trigger iio: xilinx-xadc: Fix ADC-B powerdown iio: adc: ti-ads8344: properly byte swap value iio: adc: stm32-adc: fix sleep in atomic context iio: st_sensors: rely on odr mask to know if odr can be set iio: core: remove extra semi-colon from devm_iio_device_register() macro ALSA: usb-audio: Add connector notifier delegation ALSA: usb-audio: Add static mapping table for ALC1220-VB-based mobos ALSA: hda: Remove ASUS ROG Zenith from the blacklist KEYS: Avoid false positive ENOMEM error on key read vrf: Check skb for XFRM_TRANSFORMED flag xfrm: Always set XFRM_TRANSFORMED in xfrm{4,6}_output_finish geneve: use the correct nlattr array in NL_SET_ERR_MSG_ATTR vxlan: use the correct nlattr array in NL_SET_ERR_MSG_ATTR net: dsa: b53: b53_arl_rw_op() needs to select IVL or SVL net: dsa: b53: Rework ARL bin logic net: dsa: b53: Fix ARL register definitions net: dsa: b53: Fix valid setting for MDB entries net: dsa: b53: Lookup VID in ARL searches when VLAN is enabled vrf: Fix IPv6 with qdisc and xfrm team: fix hang in team_mode_get() tcp: cache line align MAX_TCP_HEADER selftests: Fix suppress test in fib_tests.sh sched: etf: do not assume all sockets are full blown net/x25: Fix x25_neigh refcnt leak when receiving frame net: stmmac: dwmac-meson8b: Add missing boundary to RGMII TX clock array net: openvswitch: ovs_ct_exit to be done under ovs_lock net: netrom: Fix potential nr_neigh refcnt leak in nr_add_node net/mlx4_en: avoid indirect call in TX completion net: bcmgenet: correct per TX/RX ring statistics mlxsw: Fix some IS_ERR() vs NULL bugs macvlan: fix null dereference in macvlan_device_event() macsec: avoid to set wrong mtu ipv6: fix restrict IPV6_ADDRFORM operation ipv4: Update fib_select_default to handle nexthop objects cxgb4: fix large delays in PTP synchronization cxgb4: fix adapter crash due to wrong MC size PCI/PM: Add missing link delays required by the PCIe spec PCI/ASPM: Allow re-enabling Clock PM scsi: smartpqi: fix problem with unique ID for physical device scsi: smartpqi: fix call trace in device discovery scsi: smartpqi: fix controller lockup observed during force reboot virtio-blk: improve virtqueue error to BLK_STS tracing/selftests: Turn off timeout setting ASoC: SOF: trace: fix unconditional free in trace release PCI: pciehp: Prevent deadlock on disconnect libbpf: Fix readelf output parsing on powerpc with recent binutils PCI/PM: Add pcie_wait_for_link_delay() drm/amd/display: Not doing optimize bandwidth if flip pending. xhci: Finetune host initiated USB3 rootport link suspend and resume xhci: Wait until link state trainsits to U0 after setting USB_SS_PORT_LS_U0 xhci: Ensure link state is U3 after setting USB_SS_PORT_LS_U3 ALSA: usb-audio: Add Pioneer DJ DJM-250MK2 quirk ASoC: Intel: bytcr_rt5640: Add quirk for MPMAN MPWIN895CL tablet drm/amd/display: Calculate scaling ratios on every medium/full update perf/core: Disable page faults when getting phys address pwm: bcm2835: Dynamically allocate base pwm: renesas-tpu: Fix late Runtime PM enablement nvme: fix compat address handling in several ioctls powerpc/pseries: Fix MCE handling on pseries Revert "powerpc/64: irq_work avoid interrupt when called with hardware irqs enabled" loop: Better discard support for block devices s390/cio: avoid duplicated 'ADD' uevents s390/cio: generate delayed uevent for vfio-ccw subchannels lib/raid6/test: fix build on distros whose /bin/sh is not bash kconfig: qconf: Fix a few alignment issues ipc/util.c: sysvipc_find_ipc() should increase position index selftests: kmod: fix handling test numbers above 9 kernel/gcov/fs.c: gcov_seq_next() should increase position index dma-direct: fix data truncation in dma_direct_get_required_mask() drm/amd/display: Update stream adjust in dc_stream_adjust_vmin_vmax nvme: fix deadlock caused by ANA update wrong locking ASoC: Intel: atom: Take the drv->lock mutex before calling sst_send_slot_map() tools/test/nvdimm: Fix out of tree build scsi: iscsi: Report unbind session event when the target has been removed nvme-tcp: fix possible crash in write_zeroes processing pwm: rcar: Fix late Runtime PM enablement ceph: don't skip updating wanted caps when cap is stale ceph: return ceph_mdsc_do_request() errors from __get_parent() scsi: libfc: If PRLI rejected, move rport to PLOGI state scsi: lpfc: Fix crash in target side cable pulls hitting WAIT_FOR_UNREG scsi: lpfc: Fix crash after handling a pci error scsi: lpfc: Fix kasan slab-out-of-bounds error in lpfc_unreg_login watchdog: reset last_hw_keepalive time at start tools/testing/nvdimm: Fix compilation failure without CONFIG_DEV_DAX_PMEM_COMPAT arm64: Silence clang warning on mismatched value/register sizes arm64: compat: Workaround Neoverse-N1 #1542419 for compat user-space arm64: Fake the IminLine size on systems affected by Neoverse-N1 #1542419 arm64: errata: Hide CTR_EL0.DIC on systems affected by Neoverse-N1 #1542419 net, ip_tunnel: fix interface lookup with no key f2fs: fix to avoid memory leakage in f2fs_listxattr ext4: fix extent_status fragmentation for plain files ANDROID: GKI: Update abi and cf/gf whitelists ANDROID: ABI/Whitelist: update pcie whitelist to unisoc whitelist ANDROID: GKI: Update ABI for DRM core changes ANDROID: add compat cross compiler UPSTREAM: arm64: vdso32: Enable Clang Compilation BACKPORT: lib/vdso: Enable common headers BACKPORT: arm: vdso: Enable arm to use common headers BACKPORT: x86/vdso: Enable x86 to use common headers UPSTREAM: arm64: vdso32: Include common headers in the vdso library UPSTREAM: arm64: vdso: Include common headers in the vdso library UPSTREAM: arm64: Introduce asm/vdso/processor.h UPSTREAM: arm64: vdso32: Code clean up UPSTREAM: linux/elfnote.h: Replace elf.h with UAPI equivalent UPSTREAM: scripts: Fix the inclusion order in modpost UPSTREAM: common: Introduce processor.h UPSTREAM: linux/ktime.h: Extract common header for vDSO UPSTREAM: linux/jiffies.h: Extract common header for vDSO UPSTREAM: linux/time64.h: Extract common header for vDSO BACKPORT: linux/time32.h: Extract common header for vDSO BACKPORT: linux/time.h: Extract common header for vDSO UPSTREAM: linux/math64.h: Extract common header for vDSO BACKPORT: linux/clocksource.h: Extract common header for vDSO BACKPORT: arm64: Introduce asm/vdso/clocksource.h BACKPORT: arm: Introduce asm/vdso/clocksource.h BACKPORT: x86: Introduce asm/vdso/clocksource.h UPSTREAM: linux/limits.h: Extract common header for vDSO UPSTREAM: linux/bits.h: Extract common header for vDSO UPSTREAM: linux/const.h: Extract common header for vDSO BACKPORT: lib/vdso: Allow the high resolution parts to be compiled out BACKPORT: lib/vdso: Only read hrtimer_res when needed in __cvdso_clock_getres() UPSTREAM: lib/vdso: Mark do_hres() and do_coarse() as __always_inline UPSTREAM: lib/vdso: Avoid duplication in __cvdso_clock_getres() UPSTREAM: lib/vdso: Let do_coarse() return 0 to simplify the callsite UPSTREAM: lib/vdso: Remove checks on return value for 32 bit vDSO UPSTREAM: lib/vdso: Build 32 bit specific functions in the right context UPSTREAM: lib/vdso: Make __cvdso_clock_getres() static UPSTREAM: arm64: compat: vdso: Expose BUILD_VDSO32 ANDROID: GKI: Enable GENERIC_IRQ_CHIP ANDROID: ABI/Whitelist: update unisoc Whitelist after CONFIG_PPP =m ANDROID: ABI/Whitelist: update for allwinner. ANDROID: gki_defconfig: enable CONFIG_PM_DEVFREQ_EVENT. ANDROID: Incremental fs: Use simple compression in log buffer ANDROID: dm-bow: Fix not to skip trim at framented range ANDROID: Remove VLA from uid_sys_stats.c ANDROID: ABI/Whitelist: add net whitelist to unisoc Whitelist f2fs: fix missing check for f2fs_unlock_op ANDROID: gki_defconfig: enable CONFIG_MMC_CRYPTO ANDROID: Add padding for crypto related structs in UFS and MMC ANDROID: mmc: MMC crypto API ANDROID: GKI: USB: Add vendor specified variables to hc_driver ANDROID: hikey960_gki.fragment enable CONFIG_SDCARD_FS=m ANDROID: GKI: update abi.xml due to additional Android ABI padding ANDROID: GKI: elevator: add Android ABI padding to some structures ANDROID: GKI: dentry: add Android ABI padding to some structures ANDROID: GKI: bio: add Android ABI padding to some structures ANDROID: GKI: scsi: add Android ABI padding to some structures ANDROID: GKI: ufs: add Android ABI padding to some structures ANDROID: sdcardfs: fix export symbol types Linux 5.4.35 bpf, test_verifier: switch bpf_get_stack's 0 s> r8 test bpf: Test_progs, add test to catch retval refine error handling bpf: Test_verifier, bpf_get_stack return value add <0 bpf: fix buggy r0 retval refinement for tracing helpers KEYS: Don't write out to userspace while holding key semaphore mtd: phram: fix a double free issue in error path mtd: lpddr: Fix a double free in probe() docs: Fix path to MTD command line partition parser mtd: spinand: Explicitly use MTD_OPS_RAW to write the bad block marker to OOB mtd: rawnand: free the nand_device object locktorture: Print ratio of acquisitions, not failures tty: evh_bytechan: Fix out of bounds accesses fbmem: Adjust indentation in fb_prepare_logo and fb_blank iio: si1133: read 24-bit signed integer for measurement ARM: dts: sunxi: Fix DE2 clocks register range fbdev: potential information leak in do_fb_ioctl() dma-debug: fix displaying of dma allocation type net: dsa: bcm_sf2: Fix overflow checks drm/nouveau/gr/gp107,gp108: implement workaround for HW hanging during init f2fs: fix to wait all node page writeback iommu/amd: Fix the configuration of GCR3 table root pointer libnvdimm: Out of bounds read in __nd_ioctl() power: supply: axp288_fuel_gauge: Broaden vendor check for Intel Compute Sticks. csky: Fixup init_fpu compile warning with __init sunrpc: Fix gss_unwrap_resp_integ() again ext2: fix debug reference to ext2_xattr_cache iommu/vt-d: Fix page request descriptor size iommu/vt-d: Silence RCU-list debugging warning in dmar_find_atsr() ext2: fix empty body warnings when -Wextra is used SUNRPC: fix krb5p mount to provide large enough buffer in rq_rcvsize iommu/vt-d: Fix mm reference leak iommu/virtio: Fix freeing of incomplete domains drm/vc4: Fix HDMI mode validation um: falloc.h needs to be directly included for older libc ACPICA: Fixes for acpiExec namespace init file f2fs: fix NULL pointer dereference in f2fs_write_begin() csky: Fixup get wrong psr value from phyical reg NFS: Fix memory leaks in nfs_pageio_stop_mirroring() drm/amdkfd: kfree the wrong pointer csky: Fixup cpu speculative execution to IO area x86: ACPI: fix CPU hotplug deadlock leds: core: Fix warning message when init_data drm/nouveau: workaround runpm fail by disabling PCI power management on certain intel bridges KVM: s390: vsie: Fix possible race when shadowing region 3 tables compiler.h: fix error in BUILD_BUG_ON() reporting percpu_counter: fix a data race at vm_committed_as include/linux/swapops.h: correct guards for non_swap_entry() drm/nouveau/svm: fix vma range check for migration drm/nouveau/svm: check for SVM initialized before migrating mm/hugetlb: fix build failure with HUGETLB_PAGE but not HUGEBTLBFS cifs: Allocate encryption header through kmalloc um: ubd: Prevent buffer overrun on command completion ext4: do not commit super on read-only bdev s390/cpum_sf: Fix wrong page count in error message powerpc/maple: Fix declaration made after definition powerpc/prom_init: Pass the "os-term" message to hypervisor btrfs: add RCU locks around block group initialization hibernate: Allow uswsusp to write to swap s390/cpuinfo: fix wrong output when CPU0 is offline f2fs: Add a new CP flag to help fsck fix resize SPO issues f2fs: Fix mount failure due to SPO after a successful online resize FS NFS: direct.c: Fix memory leak of dreq when nfs_get_lock_context fails phy: uniphier-usb3ss: Add Pro5 support f2fs: fix to show norecovery mount option KVM: PPC: Book3S HV: Fix H_CEDE return code for nested guests ARM: dts: rockchip: fix lvds-encoder ports subnode for rk3188-bqedison2qc NFSv4.2: error out when relink swapfile NFSv4/pnfs: Return valid stateids in nfs_layout_find_inode_by_stateid() NFS: alloc_nfs_open_context() must use the file cred when available rtc: 88pm860x: fix possible race condition dma-coherent: fix integer overflow in the reserved-memory dma allocation soc: imx: gpc: fix power up sequencing arm64: dts: clearfog-gt-8k: set gigabit PHY reset deassert delay arm64: tegra: Fix Tegra194 PCIe compatible string arm64: tegra: Add PCIe endpoint controllers nodes for Tegra194 clk: tegra: Fix Tegra PMC clock out parents power: supply: bq27xxx_battery: Silence deferred-probe error arm64: dts: allwinner: a64: Fix display clock register range ARM: dts: rockchip: fix vqmmc-supply property name for rk3188-bqedison2qc f2fs: fix the panic in do_checkpoint() net/mlx5e: Enforce setting of a single FEC mode clk: at91: usb: continue if clk_hw_round_rate() return zero clk: Don't cache errors from clk_ops::get_phase() drm/ttm: flush the fence on the bo after we individualize the reservation object x86/Hyper-V: Free hv_panic_page when fail to register kmsg dump rbd: call rbd_dev_unprobe() after unwatching and flushing notifies rbd: avoid a deadlock on header_rwsem when flushing notifies block, bfq: invoke flush_idle_tree after reparent_active_queues in pd_offline block, bfq: make reparent_leaf_entity actually work only on leaf entities block, bfq: turn put_queue into release_process_ref in __bfq_bic_change_cgroup afs: Fix race between post-modification dir edit and readdir/d_revalidate afs: Fix afs_d_validate() to set the right directory version afs: Fix rename operation status delivery afs: Fix decoding of inline abort codes from version 1 status records afs: Fix missing XDR advance in xdr_decode_{AFS,YFS}FSFetchStatus() x86/Hyper-V: Report crash data in die() when panic_on_oops is set x86/Hyper-V: Report crash register data when sysctl_record_panic_msg is not set x86/Hyper-V: Report crash register data or kmsg before running crash kernel x86/Hyper-V: Trigger crash enlightenment only once during system crash. x86/Hyper-V: Unload vmbus channel in hv panic callback of: overlay: kmemleak in dup_and_fixup_symbol_prop() of: unittest: kmemleak in of_unittest_overlay_high_level() of: unittest: kmemleak in of_unittest_platform_populate() of: unittest: kmemleak on changeset destroy xsk: Add missing check on user supplied headroom size ALSA: hda: Don't release card at firmware loading error irqchip/mbigen: Free msi_desc on device teardown netfilter: nf_tables: report EOPNOTSUPP on unsupported flags/object type kbuild, btf: Fix dependencies for DEBUG_INFO_BTF ARM: dts: imx6: Use gpc for FEC interrupt controller to fix wake on LAN. ALSA: hda: Honor PM disablement in PM freeze and thaw_noirq ops scsi: sg: add sg_remove_request in sg_common_write objtool: Fix switch table detection in .text.unlikely arm, bpf: Fix offset overflow for BPF_MEM BPF_DW arm, bpf: Fix bugs with ALU64 {RSH, ARSH} BPF_K shift by 0 xsk: Fix out of boundary write in __xsk_rcv_memcpy watchdog: sp805: fix restart handler ext4: use non-movable memory for superblock readahead ANDROID: ABI/Whitelist: update unisoc Whitelist to latest ANDROID: iommu: Kconfig: Make ARM_SMMU depend on QCOM_SCM || !QCOM_SCM ANDROID: GKI: enable CONFIG_DYNAMIC_DEBUG_CORE FROMLIST: BACKPORT: dynamic_debug: Add an option to enable dynamic debug for modules only ANDROID: init: GKI: enable hidden configs for GPU FROMLIST: clocksource/drivers/sprd: Add module support to Spreadtrum timer FROMLIST: drivers/clocksource/timer-of: Remove __init markings UPSTREAM: gpu/trace: add a gpu total memory usage tracepoint Linux 5.4.34 x86/microcode/AMD: Increase microcode PATCH_MAX_SIZE scsi: target: fix hang when multiple threads try to destroy the same iscsi session scsi: target: remove boilerplate code x86/resctrl: Fix invalid attempt at removing the default resource group x86/resctrl: Preserve CDP enable over CPU hotplug irqchip/ti-sci-inta: Fix processing of masked irqs ext4: do not zeroout extents beyond i_disksize i2c: designware: platdrv: Remove DPM_FLAG_SMART_SUSPEND flag on BYT and CHT drm/amdgpu: fix the hw hang during perform system reboot and reset drm/amd/powerplay: force the trim of the mclk dpm_levels if OD is enabled net/mlx5e: Use preactivate hook to set the indirection table net/mlx5e: Rename hw_modify to preactivate net/mlx5e: Encapsulate updating netdev queues into a function mac80211_hwsim: Use kstrndup() in place of kasprintf() mac80211: fix race in ieee80211_register_hw() nl80211: fix NL80211_ATTR_FTM_RESPONDER policy btrfs: check commit root generation in should_ignore_root tracing: Fix the race between registering 'snapshot' event trigger and triggering 'snapshot' operation keys: Fix proc_keys_next to increase position index arm64: vdso: don't free unallocated pages ALSA: usb-audio: Check mapping at creating connector controls, too ALSA: usb-audio: Don't create jack controls for PCM terminals ALSA: usb-audio: Don't override ignore_ctl_error value from the map ALSA: usb-audio: Filter error from connector kctl ops, too ALSA: hda/realtek - Enable the headset mic on Asus FX505DT ASoC: Intel: mrfld: return error codes when an error occurs ASoC: Intel: mrfld: fix incorrect check on p->sink usb: dwc3: gadget: Don't clear flags before transfer ended arm64: dts: librem5-devkit: add a vbus supply to usb0 ARM: dts: imx7-colibri: fix muxing of usbc_det pin clk: at91: usb: use proper usbs_mask clk: at91: sam9x60: fix usb clock parents ext4: fix incorrect inodes per group in error message ext4: fix incorrect group count in ext4_fill_super error message net/bpfilter: remove superfluous testing message pwm: pca9685: Fix PWM/GPIO inter-operation perf report: Fix no branch type statistics report issue acpi/nfit: improve bounds checking for 'func' jbd2: improve comments about freeing data buffers whose page mapping is NULL platform/chrome: cros_ec_rpmsg: Fix race with host event scsi: ufs: Fix ufshcd_hold() caused scheduling while atomic ovl: fix value of i_ino for lower hardlink corner case Revert "ACPI: EC: Do not clear boot_ec_is_ecdt in acpi_ec_add()" net: stmmac: dwmac-sunxi: Provide TX and RX fifo sizes net/mlx5e: Fix pfnum in devlink port attribute net/mlx5e: Fix nest_level for vlan pop action net/mlx5e: Add missing release firmware call net/mlx5: Fix frequent ioread PCI access during recovery net: ethernet: mediatek: move mt7623 settings out off the mt7530 net: dsa: mt7530: move mt7623 settings out off the mt7530 net: tun: record RX queue in skb before do_xdp_generic() net: revert default NAPI poll timeout to 2 jiffies net: qrtr: send msgs from local of same id as broadcast net: phy: micrel: use genphy_read_status for KSZ9131 net: ipv6: do not consider routes via gateways for anycast address check net: ipv4: devinet: Fix crash when add/del multicast IP with autojoin net: dsa: mt7530: fix tagged frames pass-through in VLAN-unaware mode l2tp: Allow management of tunnels and session in user namespace hsr: check protocol version in hsr_newlink() amd-xgbe: Use __napi_schedule() in BH context ANDROID: Add C protos for dma_buf/drm_prime get_uuid f2fs: fix quota_sync failure due to f2fs_lock_op f2fs: support read iostat f2fs: Fix the accounting of dcc->undiscard_blks f2fs: fix to handle error path of f2fs_ra_meta_pages() f2fs: report the discard cmd errors properly f2fs: fix long latency due to discard during umount f2fs: add tracepoint for f2fs iostat f2fs: introduce sysfs/data_io_flag to attach REQ_META/FUA ANDROID: GKI: update abi for 5.4.33 changes Linux 5.4.33 scsi: lpfc: fix inlining of lpfc_sli4_cleanup_poll_list() ASoC: stm32: sai: Add missing cleanup efi/x86: Fix the deletion of variables in mixed mode mfd: dln2: Fix sanity checking for endpoints bpf: Fix tnum constraints for 32-bit comparisons mmc: sdhci: Refactor sdhci_set_timeout() mmc: sdhci: Convert sdhci_set_timeout_irq() to non-static powerpc/kasan: Fix kasan_remap_early_shadow_ro() drm/i915/icl+: Don't enable DDI IO power on a TypeC port in TBT mode drm/amdgpu: fix gfx hang during suspend with video playback (v2) drm/dp_mst: Fix clearing payload state on topology disable Revert "drm/dp_mst: Remove VCPI while disabling topology mgr" scsi: lpfc: Fix broken Credit Recovery after driver load scsi: lpfc: Fix configuration of BB credit recovery in service parameters scsi: lpfc: Fix Fabric hostname registration if system hostname changes scsi: lpfc: Add registration for CPU Offline/Online events dm clone: Add missing casts to prevent overflows and data corruption dm clone: Fix handling of partial region discards dm clone: replace spin_lock_irqsave with spin_lock_irq dm zoned: remove duplicate nr_rnd_zones increase in dmz_init_zone() arm64: Always force a branch protection mode when the compiler has one powerpc: Make setjmp/longjmp signature standard scsi: mpt3sas: Fix kernel panic observed on soft HBA unplug powerpc/64: Prevent stack protection in early boot powerpc/kprobes: Ignore traps that happened in real mode powerpc/xive: Fix xmon support on the PowerNV platform powerpc/64: Setup a paca before parsing device tree etc. powerpc/xive: Use XIVE_BAD_IRQ instead of zero to catch non configured IPIs powerpc/hash64/devmap: Use H_PAGE_THP_HUGE when setting up huge devmap PTE entries powerpc/fsl_booke: Avoid creating duplicate tlb1 entry powerpc/64/tm: Don't let userspace set regs->trap via sigreturn xen/blkfront: fix memory allocation flags in blkfront_setup_indirect() ipmi: fix hung processes in __get_guid() libata: Return correct status in sata_pmp_eh_recover_pm() when ATA_DFLAG_DETACH is set hfsplus: fix crash and filesystem corruption when deleting files cpufreq: powernv: Fix use-after-free kmod: make request_module() return an error when autoloading is disabled clk: ingenic/TCU: Fix round_rate returning error clk: ingenic/jz4770: Exit with error if CGU init failed ftrace/kprobe: Show the maxactive number on kprobe_events Input: i8042 - add Acer Aspire 5738z to nomux list s390/diag: fix display of diagnose call statistics perf tools: Support Python 3.8+ in Makefile ocfs2: no need try to truncate file beyond i_size fs/filesystems.c: downgrade user-reachable WARN_ONCE() to pr_warn_once() ext4: fix a data race at inode->i_blocks NFS: Fix a page leak in nfs_destroy_unlinked_subrequests() NFS: Fix use-after-free issues in nfs_pageio_add_request() nfsd: fsnotify on rmdir under nfsd/clients/ powerpc/pseries: Avoid NULL pointer dereference when drmem is unavailable drm/amdgpu: unify fw_write_wait for new gfx9 asics drm/amdgpu/powerplay: using the FCLK DPM table to set the MCLK drm: Remove PageReserved manipulation from drm_pci_alloc drm/etnaviv: rework perfmon query infrastructure drm/i915/gem: Flush all the reloc_gpu batch vfio: platform: Switch to platform_get_irq_optional() selftests/powerpc: Add tlbie_test in .gitignore selftests/vm: fix map_hugetlb length used for testing read and write selftests: vm: drop dependencies on page flags from mlock2 tests arm64: armv8_deprecated: Fix undef_hook mask for thumb setend arm64: dts: ti: k3-am65: Add clocks to dwc3 nodes ARM: dts: exynos: Fix polarity of the LCD SPI bus on UniversalC210 board scsi: lpfc: Fix lpfc_io_buf resource leak in lpfc_get_scsi_buf_s4 error path scsi: ufs: fix Auto-Hibern8 error detection scsi: zfcp: fix missing erp_lock in port recovery trigger for point-to-point crypto: ccree - dec auth tag size from cryptlen map crypto: ccree - only try to map auth tag if needed crypto: ccree - protect against empty or NULL scatterlists crypto: caam - update xts sector size for large input length crypto: caam/qi2 - fix chacha20 data size error xarray: Fix early termination of xas_for_each_marked XArray: Fix xas_pause for large multi-index entries dm clone metadata: Fix return type of dm_clone_nr_of_hydrated_regions() dm clone: Add overflow check for number of regions dm verity fec: fix memory leak in verity_fec_dtr dm integrity: fix a crash with unusually large tag size dm writecache: add cond_resched to avoid CPU hangs mm, memcg: do not high throttle allocators based on wraparound arm64: dts: allwinner: h5: Fix PMU compatible sched/core: Remove duplicate assignment in sched_tick_remote() arm64: dts: allwinner: h6: Fix PMU compatible net: qualcomm: rmnet: Allow configuration updates to existing devices tools: gpio: Fix out-of-tree build regression powerpc/pseries: Drop pointless static qualifier in vpa_debugfs_init() mmc: sdhci-of-esdhc: fix esdhc_reset() for different controller versions io_uring: honor original task RLIMIT_FSIZE erofs: correct the remaining shrink objects crypto: mxs-dcp - fix scatterlist linearization for hash crypto: rng - Fix a refcounting bug in crypto_rng_reset() remoteproc: Fix NULL pointer dereference in rproc_virtio_notify remoteproc: qcom_q6v5_mss: Reload the mba region on coredump remoteproc: qcom_q6v5_mss: Don't reassign mpss region on shutdown btrfs: use nofs allocations for running delayed items btrfs: fix missing semaphore unlock in btrfs_sync_file btrfs: unset reloc control if we fail to recover btrfs: fix missing file extent item for hole after ranged fsync btrfs: drop block from cache on error in relocation btrfs: set update the uuid generation as soon as possible btrfs: reloc: clean dirty subvols if we fail to start a transaction Btrfs: fix crash during unmount due to race with delayed inode workers btrfs: Don't submit any btree write bio if the fs has errors mtd: spinand: Do not erase the block before writing a bad block marker mtd: spinand: Stop using spinand->oobbuf for buffering bad block markers CIFS: Fix bug which the return value by asynchronous read is error smb3: fix performance regression with setting mtime KVM: VMX: fix crash cleanup when KVM wasn't used KVM: VMX: Add a trampoline to fix VMREAD error handling KVM: x86: Gracefully handle __vmalloc() failure during VM allocation KVM: VMX: Always VMCLEAR in-use VMCSes during crash with kexec support KVM: x86: Allocate new rmap and large page tracking when moving memslot KVM: s390: vsie: Fix delivery of addressing exceptions KVM: s390: vsie: Fix region 1 ASCE sanity shadow address checks KVM: nVMX: Properly handle userspace interrupt window request platform/x86: asus-wmi: Support laptops where the first battery is named BATT x86/entry/32: Add missing ASM_CLAC to general_protection entry x86/tsc_msr: Make MSR derived TSC frequency more accurate x86/tsc_msr: Fix MSR_FSB_FREQ mask for Cherry Trail devices x86/tsc_msr: Use named struct initializers signal: Extend exec_id to 64bits ath9k: Handle txpower changes even when TPC is disabled PM: sleep: wakeup: Skip wakeup_source_sysfs_remove() if device is not there PM / Domains: Allow no domain-idle-states DT property in genpd when parsing MIPS: OCTEON: irq: Fix potential NULL pointer dereference MIPS/tlbex: Fix LDDIR usage in setup_pw() for Loongson-3 pstore: pstore_ftrace_seq_next should increase position index io_uring: remove bogus RLIMIT_NOFILE check in file registration irqchip/versatile-fpga: Apply clear-mask earlier genirq/debugfs: Add missing sanity checks to interrupt injection cpu/hotplug: Ignore pm_wakeup_pending() for disable_nonboot_cpus() KEYS: reaching the keys quotas correctly tpm: tpm2_bios_measurements_next should increase position index tpm: tpm1_bios_measurements_next should increase position index tpm: Don't make log failures fatal sched/fair: Fix enqueue_task_fair warning PCI: endpoint: Fix for concurrent memory allocation in OB address region PCI: qcom: Fix the fixup of PCI_VENDOR_ID_QCOM PCI: Add boot interrupt quirk mechanism for Xeon chipsets PCI/ASPM: Clear the correct bits when enabling L1 substates PCI: pciehp: Fix indefinite wait on sysfs requests efi/x86: Add TPM related EFI tables to unencrypted mapping checks nvme-fc: Revert "add module to ops template to allow module references" nvmet-tcp: fix maxh2cdata icresp parameter thermal: devfreq_cooling: inline all stubs for CONFIG_DEVFREQ_THERMAL=n ACPI: PM: s2idle: Refine active GPEs check ACPICA: Allow acpi_any_gpe_status_set() to skip one GPE acpi/x86: ignore unspecified bit positions in the ACPI global lock field seccomp: Add missing compat_ioctl for notify media: ti-vpe: cal: fix a kernel oops when unloading module media: ti-vpe: cal: fix disable_irqs to only the intended target media: hantro: Read be32 words starting at every fourth byte media: venus: firmware: Ignore secure call error on first resume ALSA: hda/realtek - Add quirk for MSI GL63 ALSA: hda/realtek - Add quirk for Lenovo Carbon X1 8th gen ALSA: hda/realtek - Remove now-unnecessary XPS 13 headphone noise fixups ALSA: hda/realtek - Set principled PC Beep configuration for ALC256 ALSA: doc: Document PC Beep Hidden Register on Realtek ALC256 ALSA: hda/realtek - a fake key event is triggered by running shutup ALSA: hda/realtek: Enable mute LED on an HP system ALSA: pcm: oss: Fix regression by buffer overflow fix ALSA: ice1724: Fix invalid access for enumerated ctl items ALSA: hda: Fix potential access overflow in beep helper ALSA: hda: Add driver blacklist ALSA: usb-audio: Add mixer workaround for TRX40 and co usb: gadget: composite: Inform controller driver of self-powered usb: gadget: f_fs: Fix use after free issue as part of queue failure ASoC: topology: use name_prefix for new kcontrol ASoC: dpcm: allow start or stop during pause for backend ASoC: dapm: connect virtual mux with default value ASoC: fix regwmask btrfs: track reloc roots based on their commit root bytenr btrfs: restart relocate_tree_blocks properly btrfs: remove a BUG_ON() from merge_reloc_roots() btrfs: qgroup: ensure qgroup_rescan_running is only set when the worker is at least queued block, bfq: fix use-after-free in bfq_idle_slice_timer_body locking/lockdep: Avoid recursion in lockdep_count_{for,back}ward_deps() spi: spi-fsl-dspi: Replace interruptible wait queue with a simple completion firmware: fix a double abort case with fw_load_sysfs_fallback md: check arrays is suspended in mddev_detach before call quiesce operations irqchip/gic-v4: Provide irq_retrigger to avoid circular locking dependency usb: dwc3: core: add support for disabling SS instances in park mode media: i2c: ov5695: Fix power on and off sequences block: Fix use-after-free issue accessing struct io_cq genirq/irqdomain: Check pointer in irq_domain_alloc_irqs_hierarchy() efi/x86: Ignore the memory attributes table on i386 x86/boot: Use unsigned comparison for addresses cpufreq: imx6q: fix error handling gfs2: Don't demote a glock until its revokes are written gfs2: Do log_flush in gfs2_ail_empty_gl even if ail list is empty pstore/platform: fix potential mem leak if pstore_init_fs failed libata: Remove extra scsi_host_put() in ata_scsi_add_hosts() media: i2c: video-i2c: fix build errors due to 'imply hwmon' block, bfq: move forward the getting of an extra ref in bfq_bfqq_move PCI/switchtec: Fix init_completion race condition with poll_wait() selftests/x86/ptrace_syscall_32: Fix no-vDSO segfault sched: Avoid scale real weight down to zero media: allegro: fix type of gop_length in channel_create message time/sched_clock: Expire timer in hardirq context irqchip/versatile-fpga: Handle chained IRQs properly debugfs: Check module state before warning in {full/open}_proxy_open() block: keep bdi->io_pages in sync with max_sectors_kb for stacked devices dma-mapping: Fix dma_pgprot() for unencrypted coherent pages x86: Don't let pgprot_modify() change the page encryption bit ACPI: EC: Do not clear boot_ec_is_ecdt in acpi_ec_add() xhci: bail out early if driver can't accress host in resume media: imx: imx7-media-csi: Fix video field handling media: imx: imx7_mipi_csis: Power off the source when stopping streaming null_blk: fix spurious IO errors after failed past-wp access null_blk: Handle null_add_dev() failures properly null_blk: Fix the null_add_dev() error path firmware: arm_sdei: fix double-lock on hibernate with shared events media: venus: hfi_parser: Ignore HEVC encoding for V1 staging: wilc1000: avoid double unlocking of 'wilc->hif_cs' mutex cpufreq: imx6q: Fixes unwanted cpu overclocking on i.MX6ULL media: rc: add keymap for Videostrong KII Pro i2c: pca-platform: Use platform_irq_get_optional i2c: st: fix missing struct parameter description qlcnic: Fix bad kzalloc null test cfg80211: Do not warn on same channel at the end of CSA drm/scheduler: fix rare NULL ptr race cxgb4/ptp: pass the sign of offset delta in FW CMD selftests/net: add definition for SOL_DCCP to fix compilation errors for old libc hinic: fix wrong value of MIN_SKB_LEN hinic: fix wrong para of wait_for_completion_timeout hinic: fix out-of-order excution in arm cpu hinic: fix the bug of clearing event queue hinic: fix a bug of waitting for IO stopped net: vxge: fix wrong __VA_ARGS__ usage net: stmmac: platform: Fix misleading interrupt error msg rxrpc: Fix call interruptibility handling rxrpc: Abstract out the calculation of whether there's Tx space soc: fsl: dpio: register dpio irq handlers after dpio create Input: tm2-touchkey - add support for Coreriver TC360 variant iwlwifi: mvm: Fix rate scale NSS configuration bpf: Fix deadlock with rq_lock in bpf_send_signal() ARM: dts: Fix dm814x Ethernet by changing to use rgmii-id mode bus: sunxi-rsb: Return correct data when mixing 16-bit and 8-bit reads ARM: dts: sun8i-a83t-tbs-a711: HM5065 doesn't like such a high voltage ANDROID: GKI: ABI update for dma-buf/DRM get_uuid change ANDROID: ABI/Whitelist: update for db845c after changing drivers to modules. ANDROID: Switch CONFIG_QCOM_PDC CONFIG_QCOM_SCM and CONFIG_ARM_SMMU to be loaded as modules ANDROID: firmware: QCOM_SCM: Allow qcom_scm driver to be loadable as a permenent module ANDROID: irqchip: Allow QCOM_PDC to be loadable as a perment module ANDROID: irq: irqchip: Export irq_chip_retrigger_hierarchy and irq_chip_set_vcpu_affinity_parent ANDROID: irq: irqdomain: Export irq_domain_update_bus_token ANDROID: GKI: Add DRM_TTM config to GKI FROMLIST: drm/prime: add support for virtio exported objects FROMLIST: dma-buf: add support for virtio exported objects ANDROID: Incremental fs: Fix create_file performance UPSTREAM: Merge remote-tracking branch 'aosp/upstream-f2fs-stable-linux-5.4.y' into android-5.4 (v5.7-rc1) ANDROID: fix allmodconfig build to use the right toolchain ANDROID: Incremental fs: Fix compound page usercopy crash ANDROID: Incremental fs: Clean up incfs_test build process ANDROID: Incremental fs: make remount log buffer change atomic ANDROID: Incremental fs: Optimize get_filled_block ANDROID: Incremental fs: Fix mislabeled __user ptrs ANDROID: Incremental fs: Use 64-bit int for file_size when writing hash blocks ubifs: wire up FS_IOC_GET_ENCRYPTION_NONCE f2fs: wire up FS_IOC_GET_ENCRYPTION_NONCE ext4: wire up FS_IOC_GET_ENCRYPTION_NONCE fscrypt: add FS_IOC_GET_ENCRYPTION_NONCE ioctl f2fs: keep inline_data when compression conversion f2fs: fix to disable compression on directory f2fs: add missing CONFIG_F2FS_FS_COMPRESSION f2fs: switch discard_policy.timeout to bool type f2fs: fix to verify tpage before releasing in f2fs_free_dic() f2fs: show compression in statx f2fs: clean up dic->tpages assignment f2fs: compress: support zstd compress algorithm f2fs: compress: add .{init,destroy}_decompress_ctx callback f2fs: compress: fix to call missing destroy_compress_ctx() f2fs: change default compression algorithm f2fs: clean up {cic,dic}.ref handling f2fs: fix to use f2fs_readpage_limit() in f2fs_read_multi_pages() f2fs: xattr.h: Make stub helpers inline f2fs: fix to avoid double unlock f2fs: fix potential .flags overflow on 32bit architecture f2fs: fix NULL pointer dereference in f2fs_verity_work() f2fs: fix to clear PG_error if fsverity failed f2fs: don't call fscrypt_get_encryption_info() explicitly in f2fs_tmpfile() f2fs: don't trigger data flush in foreground operation f2fs: fix NULL pointer dereference in f2fs_write_begin() f2fs: clean up f2fs_may_encrypt() f2fs: fix to avoid potential deadlock f2fs: don't change inode status under page lock f2fs: fix potential deadlock on compressed quota file f2fs: delete DIO read lock f2fs: don't mark compressed inode dirty during f2fs_iget() f2fs: fix to account compressed blocks in f2fs_compressed_blocks() f2fs: xattr.h: Replace zero-length array with flexible-array member f2fs: fix to update f2fs_super_block fields under sb_lock f2fs: Add a new CP flag to help fsck fix resize SPO issues f2fs: Fix mount failure due to SPO after a successful online resize FS f2fs: use kmem_cache pool during inline xattr lookups f2fs: skip migration only when BG_GC is called f2fs: fix to show tracepoint correctly f2fs: avoid __GFP_NOFAIL in f2fs_bio_alloc f2fs: introduce F2FS_IOC_GET_COMPRESS_BLOCKS f2fs: fix to avoid triggering IO in write path f2fs: add prefix for f2fs slab cache name f2fs: introduce DEFAULT_IO_TIMEOUT f2fs: skip GC when section is full f2fs: add migration count iff migration happens f2fs: clean up bggc mount option f2fs: clean up lfs/adaptive mount option f2fs: fix to show norecovery mount option f2fs: clean up parameter of macro XATTR_SIZE() f2fs: clean up codes with {f2fs_,}data_blkaddr() f2fs: show mounted time f2fs: Use scnprintf() for avoiding potential buffer overflow f2fs: allow to clear F2FS_COMPR_FL flag f2fs: fix to check dirty pages during compressed inode conversion f2fs: fix to account compressed inode correctly f2fs: fix wrong check on F2FS_IOC_FSSETXATTR f2fs: fix to avoid use-after-free in f2fs_write_multi_pages() f2fs: fix to avoid using uninitialized variable f2fs: fix inconsistent comments f2fs: remove i_sem lock coverage in f2fs_setxattr() f2fs: cover last_disk_size update with spinlock f2fs: fix to check i_compr_blocks correctly f2fs: fix to avoid potential deadlock f2fs: add missing function name in kernel message f2fs: recycle unused compress_data.chksum feild f2fs: fix to avoid NULL pointer dereference f2fs: fix leaking uninitialized memory in compressed clusters f2fs: fix the panic in do_checkpoint() f2fs: fix to wait all node page writeback mm/swapfile.c: move inode_lock out of claim_swapfile fscrypt: don't evict dirty inodes after removing key Conflicts: Documentation/devicetree/bindings Documentation/devicetree/bindings/pci/nvidia,tegra194-pcie.txt Documentation/devicetree/bindings/serial/samsung_uart.txt abi_gki_aarch64_qcom_whitelist build.config.common drivers/firmware/Kconfig drivers/firmware/Makefile drivers/firmware/qcom_scm.c drivers/gpu/Makefile drivers/irqchip/qcom-pdc.c drivers/md/dm-default-key.c drivers/mmc/core/Kconfig drivers/mmc/host/sdhci-msm.c drivers/pci/pci-driver.c drivers/usb/dwc3/gadget.c include/linux/dma-mapping.h include/linux/mmc/host.h init/Kconfig.gki kernel/dma/mapping.c kernel/sched/core.c kernel/sched/fair.c lib/Kconfig.debug net/qrtr/qrtr.c Change-Id: I4db80470ba7be66c94cb7345f292bfa1e095723d Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
3452 lines
80 KiB
C
3452 lines
80 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* linux/lib/vsprintf.c
|
|
*
|
|
* Copyright (C) 1991, 1992 Linus Torvalds
|
|
*/
|
|
|
|
/* vsprintf.c -- Lars Wirzenius & Linus Torvalds. */
|
|
/*
|
|
* Wirzenius wrote this portably, Torvalds fucked it up :-)
|
|
*/
|
|
|
|
/*
|
|
* Fri Jul 13 2001 Crutcher Dunnavant <crutcher+kernel@datastacks.com>
|
|
* - changed to provide snprintf and vsnprintf functions
|
|
* So Feb 1 16:51:32 CET 2004 Juergen Quade <quade@hsnr.de>
|
|
* - scnprintf and vscnprintf
|
|
*/
|
|
|
|
#include <stdarg.h>
|
|
#include <linux/build_bug.h>
|
|
#include <linux/clk.h>
|
|
#include <linux/clk-provider.h>
|
|
#include <linux/module.h> /* for KSYM_SYMBOL_LEN */
|
|
#include <linux/types.h>
|
|
#include <linux/string.h>
|
|
#include <linux/ctype.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/kallsyms.h>
|
|
#include <linux/math64.h>
|
|
#include <linux/uaccess.h>
|
|
#include <linux/ioport.h>
|
|
#include <linux/dcache.h>
|
|
#include <linux/cred.h>
|
|
#include <linux/rtc.h>
|
|
#include <linux/uuid.h>
|
|
#include <linux/of.h>
|
|
#include <net/addrconf.h>
|
|
#include <linux/siphash.h>
|
|
#include <linux/compiler.h>
|
|
#ifdef CONFIG_BLOCK
|
|
#include <linux/blkdev.h>
|
|
#endif
|
|
|
|
#include "../mm/internal.h" /* For the trace_print_flags arrays */
|
|
|
|
#include <asm/page.h> /* for PAGE_SIZE */
|
|
#include <asm/byteorder.h> /* cpu_to_le16 */
|
|
|
|
#include <linux/string_helpers.h>
|
|
#include "kstrtox.h"
|
|
|
|
/**
|
|
* simple_strtoull - convert a string to an unsigned long long
|
|
* @cp: The start of the string
|
|
* @endp: A pointer to the end of the parsed string will be placed here
|
|
* @base: The number base to use
|
|
*
|
|
* This function is obsolete. Please use kstrtoull instead.
|
|
*/
|
|
unsigned long long simple_strtoull(const char *cp, char **endp, unsigned int base)
|
|
{
|
|
unsigned long long result;
|
|
unsigned int rv;
|
|
|
|
cp = _parse_integer_fixup_radix(cp, &base);
|
|
rv = _parse_integer(cp, base, &result);
|
|
/* FIXME */
|
|
cp += (rv & ~KSTRTOX_OVERFLOW);
|
|
|
|
if (endp)
|
|
*endp = (char *)cp;
|
|
|
|
return result;
|
|
}
|
|
EXPORT_SYMBOL(simple_strtoull);
|
|
|
|
/**
|
|
* simple_strtoul - convert a string to an unsigned long
|
|
* @cp: The start of the string
|
|
* @endp: A pointer to the end of the parsed string will be placed here
|
|
* @base: The number base to use
|
|
*
|
|
* This function is obsolete. Please use kstrtoul instead.
|
|
*/
|
|
unsigned long simple_strtoul(const char *cp, char **endp, unsigned int base)
|
|
{
|
|
return simple_strtoull(cp, endp, base);
|
|
}
|
|
EXPORT_SYMBOL(simple_strtoul);
|
|
|
|
/**
|
|
* simple_strtol - convert a string to a signed long
|
|
* @cp: The start of the string
|
|
* @endp: A pointer to the end of the parsed string will be placed here
|
|
* @base: The number base to use
|
|
*
|
|
* This function is obsolete. Please use kstrtol instead.
|
|
*/
|
|
long simple_strtol(const char *cp, char **endp, unsigned int base)
|
|
{
|
|
if (*cp == '-')
|
|
return -simple_strtoul(cp + 1, endp, base);
|
|
|
|
return simple_strtoul(cp, endp, base);
|
|
}
|
|
EXPORT_SYMBOL(simple_strtol);
|
|
|
|
/**
|
|
* simple_strtoll - convert a string to a signed long long
|
|
* @cp: The start of the string
|
|
* @endp: A pointer to the end of the parsed string will be placed here
|
|
* @base: The number base to use
|
|
*
|
|
* This function is obsolete. Please use kstrtoll instead.
|
|
*/
|
|
long long simple_strtoll(const char *cp, char **endp, unsigned int base)
|
|
{
|
|
if (*cp == '-')
|
|
return -simple_strtoull(cp + 1, endp, base);
|
|
|
|
return simple_strtoull(cp, endp, base);
|
|
}
|
|
EXPORT_SYMBOL(simple_strtoll);
|
|
|
|
static noinline_for_stack
|
|
int skip_atoi(const char **s)
|
|
{
|
|
int i = 0;
|
|
|
|
do {
|
|
i = i*10 + *((*s)++) - '0';
|
|
} while (isdigit(**s));
|
|
|
|
return i;
|
|
}
|
|
|
|
/*
|
|
* Decimal conversion is by far the most typical, and is used for
|
|
* /proc and /sys data. This directly impacts e.g. top performance
|
|
* with many processes running. We optimize it for speed by emitting
|
|
* two characters at a time, using a 200 byte lookup table. This
|
|
* roughly halves the number of multiplications compared to computing
|
|
* the digits one at a time. Implementation strongly inspired by the
|
|
* previous version, which in turn used ideas described at
|
|
* <http://www.cs.uiowa.edu/~jones/bcd/divide.html> (with permission
|
|
* from the author, Douglas W. Jones).
|
|
*
|
|
* It turns out there is precisely one 26 bit fixed-point
|
|
* approximation a of 64/100 for which x/100 == (x * (u64)a) >> 32
|
|
* holds for all x in [0, 10^8-1], namely a = 0x28f5c29. The actual
|
|
* range happens to be somewhat larger (x <= 1073741898), but that's
|
|
* irrelevant for our purpose.
|
|
*
|
|
* For dividing a number in the range [10^4, 10^6-1] by 100, we still
|
|
* need a 32x32->64 bit multiply, so we simply use the same constant.
|
|
*
|
|
* For dividing a number in the range [100, 10^4-1] by 100, there are
|
|
* several options. The simplest is (x * 0x147b) >> 19, which is valid
|
|
* for all x <= 43698.
|
|
*/
|
|
|
|
static const u16 decpair[100] = {
|
|
#define _(x) (__force u16) cpu_to_le16(((x % 10) | ((x / 10) << 8)) + 0x3030)
|
|
_( 0), _( 1), _( 2), _( 3), _( 4), _( 5), _( 6), _( 7), _( 8), _( 9),
|
|
_(10), _(11), _(12), _(13), _(14), _(15), _(16), _(17), _(18), _(19),
|
|
_(20), _(21), _(22), _(23), _(24), _(25), _(26), _(27), _(28), _(29),
|
|
_(30), _(31), _(32), _(33), _(34), _(35), _(36), _(37), _(38), _(39),
|
|
_(40), _(41), _(42), _(43), _(44), _(45), _(46), _(47), _(48), _(49),
|
|
_(50), _(51), _(52), _(53), _(54), _(55), _(56), _(57), _(58), _(59),
|
|
_(60), _(61), _(62), _(63), _(64), _(65), _(66), _(67), _(68), _(69),
|
|
_(70), _(71), _(72), _(73), _(74), _(75), _(76), _(77), _(78), _(79),
|
|
_(80), _(81), _(82), _(83), _(84), _(85), _(86), _(87), _(88), _(89),
|
|
_(90), _(91), _(92), _(93), _(94), _(95), _(96), _(97), _(98), _(99),
|
|
#undef _
|
|
};
|
|
|
|
/*
|
|
* This will print a single '0' even if r == 0, since we would
|
|
* immediately jump to out_r where two 0s would be written but only
|
|
* one of them accounted for in buf. This is needed by ip4_string
|
|
* below. All other callers pass a non-zero value of r.
|
|
*/
|
|
static noinline_for_stack
|
|
char *put_dec_trunc8(char *buf, unsigned r)
|
|
{
|
|
unsigned q;
|
|
|
|
/* 1 <= r < 10^8 */
|
|
if (r < 100)
|
|
goto out_r;
|
|
|
|
/* 100 <= r < 10^8 */
|
|
q = (r * (u64)0x28f5c29) >> 32;
|
|
*((u16 *)buf) = decpair[r - 100*q];
|
|
buf += 2;
|
|
|
|
/* 1 <= q < 10^6 */
|
|
if (q < 100)
|
|
goto out_q;
|
|
|
|
/* 100 <= q < 10^6 */
|
|
r = (q * (u64)0x28f5c29) >> 32;
|
|
*((u16 *)buf) = decpair[q - 100*r];
|
|
buf += 2;
|
|
|
|
/* 1 <= r < 10^4 */
|
|
if (r < 100)
|
|
goto out_r;
|
|
|
|
/* 100 <= r < 10^4 */
|
|
q = (r * 0x147b) >> 19;
|
|
*((u16 *)buf) = decpair[r - 100*q];
|
|
buf += 2;
|
|
out_q:
|
|
/* 1 <= q < 100 */
|
|
r = q;
|
|
out_r:
|
|
/* 1 <= r < 100 */
|
|
*((u16 *)buf) = decpair[r];
|
|
buf += r < 10 ? 1 : 2;
|
|
return buf;
|
|
}
|
|
|
|
#if BITS_PER_LONG == 64 && BITS_PER_LONG_LONG == 64
|
|
static noinline_for_stack
|
|
char *put_dec_full8(char *buf, unsigned r)
|
|
{
|
|
unsigned q;
|
|
|
|
/* 0 <= r < 10^8 */
|
|
q = (r * (u64)0x28f5c29) >> 32;
|
|
*((u16 *)buf) = decpair[r - 100*q];
|
|
buf += 2;
|
|
|
|
/* 0 <= q < 10^6 */
|
|
r = (q * (u64)0x28f5c29) >> 32;
|
|
*((u16 *)buf) = decpair[q - 100*r];
|
|
buf += 2;
|
|
|
|
/* 0 <= r < 10^4 */
|
|
q = (r * 0x147b) >> 19;
|
|
*((u16 *)buf) = decpair[r - 100*q];
|
|
buf += 2;
|
|
|
|
/* 0 <= q < 100 */
|
|
*((u16 *)buf) = decpair[q];
|
|
buf += 2;
|
|
return buf;
|
|
}
|
|
|
|
static noinline_for_stack
|
|
char *put_dec(char *buf, unsigned long long n)
|
|
{
|
|
if (n >= 100*1000*1000)
|
|
buf = put_dec_full8(buf, do_div(n, 100*1000*1000));
|
|
/* 1 <= n <= 1.6e11 */
|
|
if (n >= 100*1000*1000)
|
|
buf = put_dec_full8(buf, do_div(n, 100*1000*1000));
|
|
/* 1 <= n < 1e8 */
|
|
return put_dec_trunc8(buf, n);
|
|
}
|
|
|
|
#elif BITS_PER_LONG == 32 && BITS_PER_LONG_LONG == 64
|
|
|
|
static void
|
|
put_dec_full4(char *buf, unsigned r)
|
|
{
|
|
unsigned q;
|
|
|
|
/* 0 <= r < 10^4 */
|
|
q = (r * 0x147b) >> 19;
|
|
*((u16 *)buf) = decpair[r - 100*q];
|
|
buf += 2;
|
|
/* 0 <= q < 100 */
|
|
*((u16 *)buf) = decpair[q];
|
|
}
|
|
|
|
/*
|
|
* Call put_dec_full4 on x % 10000, return x / 10000.
|
|
* The approximation x/10000 == (x * 0x346DC5D7) >> 43
|
|
* holds for all x < 1,128,869,999. The largest value this
|
|
* helper will ever be asked to convert is 1,125,520,955.
|
|
* (second call in the put_dec code, assuming n is all-ones).
|
|
*/
|
|
static noinline_for_stack
|
|
unsigned put_dec_helper4(char *buf, unsigned x)
|
|
{
|
|
uint32_t q = (x * (uint64_t)0x346DC5D7) >> 43;
|
|
|
|
put_dec_full4(buf, x - q * 10000);
|
|
return q;
|
|
}
|
|
|
|
/* Based on code by Douglas W. Jones found at
|
|
* <http://www.cs.uiowa.edu/~jones/bcd/decimal.html#sixtyfour>
|
|
* (with permission from the author).
|
|
* Performs no 64-bit division and hence should be fast on 32-bit machines.
|
|
*/
|
|
static
|
|
char *put_dec(char *buf, unsigned long long n)
|
|
{
|
|
uint32_t d3, d2, d1, q, h;
|
|
|
|
if (n < 100*1000*1000)
|
|
return put_dec_trunc8(buf, n);
|
|
|
|
d1 = ((uint32_t)n >> 16); /* implicit "& 0xffff" */
|
|
h = (n >> 32);
|
|
d2 = (h ) & 0xffff;
|
|
d3 = (h >> 16); /* implicit "& 0xffff" */
|
|
|
|
/* n = 2^48 d3 + 2^32 d2 + 2^16 d1 + d0
|
|
= 281_4749_7671_0656 d3 + 42_9496_7296 d2 + 6_5536 d1 + d0 */
|
|
q = 656 * d3 + 7296 * d2 + 5536 * d1 + ((uint32_t)n & 0xffff);
|
|
q = put_dec_helper4(buf, q);
|
|
|
|
q += 7671 * d3 + 9496 * d2 + 6 * d1;
|
|
q = put_dec_helper4(buf+4, q);
|
|
|
|
q += 4749 * d3 + 42 * d2;
|
|
q = put_dec_helper4(buf+8, q);
|
|
|
|
q += 281 * d3;
|
|
buf += 12;
|
|
if (q)
|
|
buf = put_dec_trunc8(buf, q);
|
|
else while (buf[-1] == '0')
|
|
--buf;
|
|
|
|
return buf;
|
|
}
|
|
|
|
#endif
|
|
|
|
/*
|
|
* Convert passed number to decimal string.
|
|
* Returns the length of string. On buffer overflow, returns 0.
|
|
*
|
|
* If speed is not important, use snprintf(). It's easy to read the code.
|
|
*/
|
|
int num_to_str(char *buf, int size, unsigned long long num, unsigned int width)
|
|
{
|
|
/* put_dec requires 2-byte alignment of the buffer. */
|
|
char tmp[sizeof(num) * 3] __aligned(2);
|
|
int idx, len;
|
|
|
|
/* put_dec() may work incorrectly for num = 0 (generate "", not "0") */
|
|
if (num <= 9) {
|
|
tmp[0] = '0' + num;
|
|
len = 1;
|
|
} else {
|
|
len = put_dec(tmp, num) - tmp;
|
|
}
|
|
|
|
if (len > size || width > size)
|
|
return 0;
|
|
|
|
if (width > len) {
|
|
width = width - len;
|
|
for (idx = 0; idx < width; idx++)
|
|
buf[idx] = ' ';
|
|
} else {
|
|
width = 0;
|
|
}
|
|
|
|
for (idx = 0; idx < len; ++idx)
|
|
buf[idx + width] = tmp[len - idx - 1];
|
|
|
|
return len + width;
|
|
}
|
|
|
|
#define SIGN 1 /* unsigned/signed, must be 1 */
|
|
#define LEFT 2 /* left justified */
|
|
#define PLUS 4 /* show plus */
|
|
#define SPACE 8 /* space if plus */
|
|
#define ZEROPAD 16 /* pad with zero, must be 16 == '0' - ' ' */
|
|
#define SMALL 32 /* use lowercase in hex (must be 32 == 0x20) */
|
|
#define SPECIAL 64 /* prefix hex with "0x", octal with "0" */
|
|
|
|
enum format_type {
|
|
FORMAT_TYPE_NONE, /* Just a string part */
|
|
FORMAT_TYPE_WIDTH,
|
|
FORMAT_TYPE_PRECISION,
|
|
FORMAT_TYPE_CHAR,
|
|
FORMAT_TYPE_STR,
|
|
FORMAT_TYPE_PTR,
|
|
FORMAT_TYPE_PERCENT_CHAR,
|
|
FORMAT_TYPE_INVALID,
|
|
FORMAT_TYPE_LONG_LONG,
|
|
FORMAT_TYPE_ULONG,
|
|
FORMAT_TYPE_LONG,
|
|
FORMAT_TYPE_UBYTE,
|
|
FORMAT_TYPE_BYTE,
|
|
FORMAT_TYPE_USHORT,
|
|
FORMAT_TYPE_SHORT,
|
|
FORMAT_TYPE_UINT,
|
|
FORMAT_TYPE_INT,
|
|
FORMAT_TYPE_SIZE_T,
|
|
FORMAT_TYPE_PTRDIFF
|
|
};
|
|
|
|
struct printf_spec {
|
|
unsigned int type:8; /* format_type enum */
|
|
signed int field_width:24; /* width of output field */
|
|
unsigned int flags:8; /* flags to number() */
|
|
unsigned int base:8; /* number base, 8, 10 or 16 only */
|
|
signed int precision:16; /* # of digits/chars */
|
|
} __packed;
|
|
static_assert(sizeof(struct printf_spec) == 8);
|
|
|
|
#define FIELD_WIDTH_MAX ((1 << 23) - 1)
|
|
#define PRECISION_MAX ((1 << 15) - 1)
|
|
|
|
static noinline_for_stack
|
|
char *number(char *buf, char *end, unsigned long long num,
|
|
struct printf_spec spec)
|
|
{
|
|
/* put_dec requires 2-byte alignment of the buffer. */
|
|
char tmp[3 * sizeof(num)] __aligned(2);
|
|
char sign;
|
|
char locase;
|
|
int need_pfx = ((spec.flags & SPECIAL) && spec.base != 10);
|
|
int i;
|
|
bool is_zero = num == 0LL;
|
|
int field_width = spec.field_width;
|
|
int precision = spec.precision;
|
|
|
|
/* locase = 0 or 0x20. ORing digits or letters with 'locase'
|
|
* produces same digits or (maybe lowercased) letters */
|
|
locase = (spec.flags & SMALL);
|
|
if (spec.flags & LEFT)
|
|
spec.flags &= ~ZEROPAD;
|
|
sign = 0;
|
|
if (spec.flags & SIGN) {
|
|
if ((signed long long)num < 0) {
|
|
sign = '-';
|
|
num = -(signed long long)num;
|
|
field_width--;
|
|
} else if (spec.flags & PLUS) {
|
|
sign = '+';
|
|
field_width--;
|
|
} else if (spec.flags & SPACE) {
|
|
sign = ' ';
|
|
field_width--;
|
|
}
|
|
}
|
|
if (need_pfx) {
|
|
if (spec.base == 16)
|
|
field_width -= 2;
|
|
else if (!is_zero)
|
|
field_width--;
|
|
}
|
|
|
|
/* generate full string in tmp[], in reverse order */
|
|
i = 0;
|
|
if (num < spec.base)
|
|
tmp[i++] = hex_asc_upper[num] | locase;
|
|
else if (spec.base != 10) { /* 8 or 16 */
|
|
int mask = spec.base - 1;
|
|
int shift = 3;
|
|
|
|
if (spec.base == 16)
|
|
shift = 4;
|
|
do {
|
|
tmp[i++] = (hex_asc_upper[((unsigned char)num) & mask] | locase);
|
|
num >>= shift;
|
|
} while (num);
|
|
} else { /* base 10 */
|
|
i = put_dec(tmp, num) - tmp;
|
|
}
|
|
|
|
/* printing 100 using %2d gives "100", not "00" */
|
|
if (i > precision)
|
|
precision = i;
|
|
/* leading space padding */
|
|
field_width -= precision;
|
|
if (!(spec.flags & (ZEROPAD | LEFT))) {
|
|
while (--field_width >= 0) {
|
|
if (buf < end)
|
|
*buf = ' ';
|
|
++buf;
|
|
}
|
|
}
|
|
/* sign */
|
|
if (sign) {
|
|
if (buf < end)
|
|
*buf = sign;
|
|
++buf;
|
|
}
|
|
/* "0x" / "0" prefix */
|
|
if (need_pfx) {
|
|
if (spec.base == 16 || !is_zero) {
|
|
if (buf < end)
|
|
*buf = '0';
|
|
++buf;
|
|
}
|
|
if (spec.base == 16) {
|
|
if (buf < end)
|
|
*buf = ('X' | locase);
|
|
++buf;
|
|
}
|
|
}
|
|
/* zero or space padding */
|
|
if (!(spec.flags & LEFT)) {
|
|
char c = ' ' + (spec.flags & ZEROPAD);
|
|
BUILD_BUG_ON(' ' + ZEROPAD != '0');
|
|
while (--field_width >= 0) {
|
|
if (buf < end)
|
|
*buf = c;
|
|
++buf;
|
|
}
|
|
}
|
|
/* hmm even more zero padding? */
|
|
while (i <= --precision) {
|
|
if (buf < end)
|
|
*buf = '0';
|
|
++buf;
|
|
}
|
|
/* actual digits of result */
|
|
while (--i >= 0) {
|
|
if (buf < end)
|
|
*buf = tmp[i];
|
|
++buf;
|
|
}
|
|
/* trailing space padding */
|
|
while (--field_width >= 0) {
|
|
if (buf < end)
|
|
*buf = ' ';
|
|
++buf;
|
|
}
|
|
|
|
return buf;
|
|
}
|
|
|
|
static noinline_for_stack
|
|
char *special_hex_number(char *buf, char *end, unsigned long long num, int size)
|
|
{
|
|
struct printf_spec spec;
|
|
|
|
spec.type = FORMAT_TYPE_PTR;
|
|
spec.field_width = 2 + 2 * size; /* 0x + hex */
|
|
spec.flags = SPECIAL | SMALL | ZEROPAD;
|
|
spec.base = 16;
|
|
spec.precision = -1;
|
|
|
|
return number(buf, end, num, spec);
|
|
}
|
|
|
|
static void move_right(char *buf, char *end, unsigned len, unsigned spaces)
|
|
{
|
|
size_t size;
|
|
if (buf >= end) /* nowhere to put anything */
|
|
return;
|
|
size = end - buf;
|
|
if (size <= spaces) {
|
|
memset(buf, ' ', size);
|
|
return;
|
|
}
|
|
if (len) {
|
|
if (len > size - spaces)
|
|
len = size - spaces;
|
|
memmove(buf + spaces, buf, len);
|
|
}
|
|
memset(buf, ' ', spaces);
|
|
}
|
|
|
|
/*
|
|
* Handle field width padding for a string.
|
|
* @buf: current buffer position
|
|
* @n: length of string
|
|
* @end: end of output buffer
|
|
* @spec: for field width and flags
|
|
* Returns: new buffer position after padding.
|
|
*/
|
|
static noinline_for_stack
|
|
char *widen_string(char *buf, int n, char *end, struct printf_spec spec)
|
|
{
|
|
unsigned spaces;
|
|
|
|
if (likely(n >= spec.field_width))
|
|
return buf;
|
|
/* we want to pad the sucker */
|
|
spaces = spec.field_width - n;
|
|
if (!(spec.flags & LEFT)) {
|
|
move_right(buf - n, end, n, spaces);
|
|
return buf + spaces;
|
|
}
|
|
while (spaces--) {
|
|
if (buf < end)
|
|
*buf = ' ';
|
|
++buf;
|
|
}
|
|
return buf;
|
|
}
|
|
|
|
/* Handle string from a well known address. */
|
|
static char *string_nocheck(char *buf, char *end, const char *s,
|
|
struct printf_spec spec)
|
|
{
|
|
int len = 0;
|
|
int lim = spec.precision;
|
|
|
|
while (lim--) {
|
|
char c = *s++;
|
|
if (!c)
|
|
break;
|
|
if (buf < end)
|
|
*buf = c;
|
|
++buf;
|
|
++len;
|
|
}
|
|
return widen_string(buf, len, end, spec);
|
|
}
|
|
|
|
/* Be careful: error messages must fit into the given buffer. */
|
|
static char *error_string(char *buf, char *end, const char *s,
|
|
struct printf_spec spec)
|
|
{
|
|
/*
|
|
* Hard limit to avoid a completely insane messages. It actually
|
|
* works pretty well because most error messages are in
|
|
* the many pointer format modifiers.
|
|
*/
|
|
if (spec.precision == -1)
|
|
spec.precision = 2 * sizeof(void *);
|
|
|
|
return string_nocheck(buf, end, s, spec);
|
|
}
|
|
|
|
/*
|
|
* Do not call any complex external code here. Nested printk()/vsprintf()
|
|
* might cause infinite loops. Failures might break printk() and would
|
|
* be hard to debug.
|
|
*/
|
|
static const char *check_pointer_msg(const void *ptr)
|
|
{
|
|
if (!ptr)
|
|
return "(null)";
|
|
|
|
if ((unsigned long)ptr < PAGE_SIZE || IS_ERR_VALUE(ptr))
|
|
return "(efault)";
|
|
|
|
return NULL;
|
|
}
|
|
|
|
static int check_pointer(char **buf, char *end, const void *ptr,
|
|
struct printf_spec spec)
|
|
{
|
|
const char *err_msg;
|
|
|
|
err_msg = check_pointer_msg(ptr);
|
|
if (err_msg) {
|
|
*buf = error_string(*buf, end, err_msg, spec);
|
|
return -EFAULT;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static noinline_for_stack
|
|
char *string(char *buf, char *end, const char *s,
|
|
struct printf_spec spec)
|
|
{
|
|
if (check_pointer(&buf, end, s, spec))
|
|
return buf;
|
|
|
|
return string_nocheck(buf, end, s, spec);
|
|
}
|
|
|
|
static char *pointer_string(char *buf, char *end,
|
|
const void *ptr,
|
|
struct printf_spec spec)
|
|
{
|
|
spec.base = 16;
|
|
spec.flags |= SMALL;
|
|
if (spec.field_width == -1) {
|
|
spec.field_width = 2 * sizeof(ptr);
|
|
spec.flags |= ZEROPAD;
|
|
}
|
|
|
|
return number(buf, end, (unsigned long int)ptr, spec);
|
|
}
|
|
|
|
/* Make pointers available for printing early in the boot sequence. */
|
|
static int debug_boot_weak_hash __ro_after_init;
|
|
|
|
static int __init debug_boot_weak_hash_enable(char *str)
|
|
{
|
|
debug_boot_weak_hash = 1;
|
|
pr_info("debug_boot_weak_hash enabled\n");
|
|
return 0;
|
|
}
|
|
early_param("debug_boot_weak_hash", debug_boot_weak_hash_enable);
|
|
|
|
static DEFINE_STATIC_KEY_TRUE(not_filled_random_ptr_key);
|
|
static siphash_key_t ptr_key __read_mostly;
|
|
|
|
static void enable_ptr_key_workfn(struct work_struct *work)
|
|
{
|
|
get_random_bytes(&ptr_key, sizeof(ptr_key));
|
|
/* Needs to run from preemptible context */
|
|
static_branch_disable(¬_filled_random_ptr_key);
|
|
}
|
|
|
|
static DECLARE_WORK(enable_ptr_key_work, enable_ptr_key_workfn);
|
|
|
|
static void fill_random_ptr_key(struct random_ready_callback *unused)
|
|
{
|
|
/* This may be in an interrupt handler. */
|
|
queue_work(system_unbound_wq, &enable_ptr_key_work);
|
|
}
|
|
|
|
static struct random_ready_callback random_ready = {
|
|
.func = fill_random_ptr_key
|
|
};
|
|
|
|
static int __init initialize_ptr_random(void)
|
|
{
|
|
int key_size = sizeof(ptr_key);
|
|
int ret;
|
|
|
|
/* Use hw RNG if available. */
|
|
if (get_random_bytes_arch(&ptr_key, key_size) == key_size) {
|
|
static_branch_disable(¬_filled_random_ptr_key);
|
|
return 0;
|
|
}
|
|
|
|
ret = add_random_ready_callback(&random_ready);
|
|
if (!ret) {
|
|
return 0;
|
|
} else if (ret == -EALREADY) {
|
|
/* This is in preemptible context */
|
|
enable_ptr_key_workfn(&enable_ptr_key_work);
|
|
return 0;
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
early_initcall(initialize_ptr_random);
|
|
|
|
static inline int __ptr_to_hashval(const void *ptr, unsigned long *hashval_out)
|
|
{
|
|
unsigned long hashval;
|
|
|
|
if (static_branch_unlikely(¬_filled_random_ptr_key))
|
|
return -EAGAIN;
|
|
|
|
#ifdef CONFIG_64BIT
|
|
hashval = (unsigned long)siphash_1u64((u64)ptr, &ptr_key);
|
|
/*
|
|
* Mask off the first 32 bits, this makes explicit that we have
|
|
* modified the address (and 32 bits is plenty for a unique ID).
|
|
*/
|
|
hashval = hashval & 0xffffffff;
|
|
#else
|
|
hashval = (unsigned long)siphash_1u32((u32)ptr, &ptr_key);
|
|
#endif
|
|
*hashval_out = hashval;
|
|
return 0;
|
|
}
|
|
|
|
int ptr_to_hashval(const void *ptr, unsigned long *hashval_out)
|
|
{
|
|
return __ptr_to_hashval(ptr, hashval_out);
|
|
}
|
|
|
|
/* Maps a pointer to a 32 bit unique identifier. */
|
|
static char *ptr_to_id(char *buf, char *end, const void *ptr,
|
|
struct printf_spec spec)
|
|
{
|
|
const char *str = sizeof(ptr) == 8 ? "(____ptrval____)" : "(ptrval)";
|
|
unsigned long hashval;
|
|
int ret;
|
|
|
|
/*
|
|
* Print the real pointer value for NULL and error pointers,
|
|
* as they are not actual addresses.
|
|
*/
|
|
if (IS_ERR_OR_NULL(ptr))
|
|
return pointer_string(buf, end, ptr, spec);
|
|
|
|
/* When debugging early boot use non-cryptographically secure hash. */
|
|
if (unlikely(debug_boot_weak_hash)) {
|
|
hashval = hash_long((unsigned long)ptr, 32);
|
|
return pointer_string(buf, end, (const void *)hashval, spec);
|
|
}
|
|
|
|
ret = __ptr_to_hashval(ptr, &hashval);
|
|
if (ret) {
|
|
spec.field_width = 2 * sizeof(ptr);
|
|
/* string length must be less than default_width */
|
|
return error_string(buf, end, str, spec);
|
|
}
|
|
|
|
return pointer_string(buf, end, (const void *)hashval, spec);
|
|
}
|
|
|
|
int kptr_restrict __read_mostly;
|
|
|
|
static noinline_for_stack
|
|
char *restricted_pointer(char *buf, char *end, const void *ptr,
|
|
struct printf_spec spec)
|
|
{
|
|
switch (kptr_restrict) {
|
|
case 0:
|
|
/* Handle as %p, hash and do _not_ leak addresses. */
|
|
return ptr_to_id(buf, end, ptr, spec);
|
|
case 1: {
|
|
const struct cred *cred;
|
|
|
|
/*
|
|
* kptr_restrict==1 cannot be used in IRQ context
|
|
* because its test for CAP_SYSLOG would be meaningless.
|
|
*/
|
|
if (in_irq() || in_serving_softirq() || in_nmi()) {
|
|
if (spec.field_width == -1)
|
|
spec.field_width = 2 * sizeof(ptr);
|
|
return error_string(buf, end, "pK-error", spec);
|
|
}
|
|
|
|
/*
|
|
* Only print the real pointer value if the current
|
|
* process has CAP_SYSLOG and is running with the
|
|
* same credentials it started with. This is because
|
|
* access to files is checked at open() time, but %pK
|
|
* checks permission at read() time. We don't want to
|
|
* leak pointer values if a binary opens a file using
|
|
* %pK and then elevates privileges before reading it.
|
|
*/
|
|
cred = current_cred();
|
|
if (!has_capability_noaudit(current, CAP_SYSLOG) ||
|
|
!uid_eq(cred->euid, cred->uid) ||
|
|
!gid_eq(cred->egid, cred->gid))
|
|
ptr = NULL;
|
|
break;
|
|
}
|
|
case 2:
|
|
default:
|
|
/* Always print 0's for %pK */
|
|
ptr = NULL;
|
|
break;
|
|
}
|
|
|
|
return pointer_string(buf, end, ptr, spec);
|
|
}
|
|
|
|
static noinline_for_stack
|
|
char *dentry_name(char *buf, char *end, const struct dentry *d, struct printf_spec spec,
|
|
const char *fmt)
|
|
{
|
|
const char *array[4], *s;
|
|
const struct dentry *p;
|
|
int depth;
|
|
int i, n;
|
|
|
|
switch (fmt[1]) {
|
|
case '2': case '3': case '4':
|
|
depth = fmt[1] - '0';
|
|
break;
|
|
default:
|
|
depth = 1;
|
|
}
|
|
|
|
rcu_read_lock();
|
|
for (i = 0; i < depth; i++, d = p) {
|
|
if (check_pointer(&buf, end, d, spec)) {
|
|
rcu_read_unlock();
|
|
return buf;
|
|
}
|
|
|
|
p = READ_ONCE(d->d_parent);
|
|
array[i] = READ_ONCE(d->d_name.name);
|
|
if (p == d) {
|
|
if (i)
|
|
array[i] = "";
|
|
i++;
|
|
break;
|
|
}
|
|
}
|
|
s = array[--i];
|
|
for (n = 0; n != spec.precision; n++, buf++) {
|
|
char c = *s++;
|
|
if (!c) {
|
|
if (!i)
|
|
break;
|
|
c = '/';
|
|
s = array[--i];
|
|
}
|
|
if (buf < end)
|
|
*buf = c;
|
|
}
|
|
rcu_read_unlock();
|
|
return widen_string(buf, n, end, spec);
|
|
}
|
|
|
|
static noinline_for_stack
|
|
char *file_dentry_name(char *buf, char *end, const struct file *f,
|
|
struct printf_spec spec, const char *fmt)
|
|
{
|
|
if (check_pointer(&buf, end, f, spec))
|
|
return buf;
|
|
|
|
return dentry_name(buf, end, f->f_path.dentry, spec, fmt);
|
|
}
|
|
#ifdef CONFIG_BLOCK
|
|
static noinline_for_stack
|
|
char *bdev_name(char *buf, char *end, struct block_device *bdev,
|
|
struct printf_spec spec, const char *fmt)
|
|
{
|
|
struct gendisk *hd;
|
|
|
|
if (check_pointer(&buf, end, bdev, spec))
|
|
return buf;
|
|
|
|
hd = bdev->bd_disk;
|
|
buf = string(buf, end, hd->disk_name, spec);
|
|
if (bdev->bd_part->partno) {
|
|
if (isdigit(hd->disk_name[strlen(hd->disk_name)-1])) {
|
|
if (buf < end)
|
|
*buf = 'p';
|
|
buf++;
|
|
}
|
|
buf = number(buf, end, bdev->bd_part->partno, spec);
|
|
}
|
|
return buf;
|
|
}
|
|
#endif
|
|
|
|
static noinline_for_stack
|
|
char *symbol_string(char *buf, char *end, void *ptr,
|
|
struct printf_spec spec, const char *fmt)
|
|
{
|
|
unsigned long value;
|
|
#ifdef CONFIG_KALLSYMS
|
|
char sym[KSYM_SYMBOL_LEN];
|
|
#endif
|
|
|
|
if (fmt[1] == 'R')
|
|
ptr = __builtin_extract_return_addr(ptr);
|
|
value = (unsigned long)ptr;
|
|
|
|
#ifdef CONFIG_KALLSYMS
|
|
if (*fmt == 'B')
|
|
sprint_backtrace(sym, value);
|
|
else if (*fmt != 'f' && *fmt != 's')
|
|
sprint_symbol(sym, value);
|
|
else
|
|
sprint_symbol_no_offset(sym, value);
|
|
|
|
return string_nocheck(buf, end, sym, spec);
|
|
#else
|
|
return special_hex_number(buf, end, value, sizeof(void *));
|
|
#endif
|
|
}
|
|
|
|
static const struct printf_spec default_str_spec = {
|
|
.field_width = -1,
|
|
.precision = -1,
|
|
};
|
|
|
|
static const struct printf_spec default_flag_spec = {
|
|
.base = 16,
|
|
.precision = -1,
|
|
.flags = SPECIAL | SMALL,
|
|
};
|
|
|
|
static const struct printf_spec default_dec_spec = {
|
|
.base = 10,
|
|
.precision = -1,
|
|
};
|
|
|
|
static const struct printf_spec default_dec02_spec = {
|
|
.base = 10,
|
|
.field_width = 2,
|
|
.precision = -1,
|
|
.flags = ZEROPAD,
|
|
};
|
|
|
|
static const struct printf_spec default_dec04_spec = {
|
|
.base = 10,
|
|
.field_width = 4,
|
|
.precision = -1,
|
|
.flags = ZEROPAD,
|
|
};
|
|
|
|
static noinline_for_stack
|
|
char *resource_string(char *buf, char *end, struct resource *res,
|
|
struct printf_spec spec, const char *fmt)
|
|
{
|
|
#ifndef IO_RSRC_PRINTK_SIZE
|
|
#define IO_RSRC_PRINTK_SIZE 6
|
|
#endif
|
|
|
|
#ifndef MEM_RSRC_PRINTK_SIZE
|
|
#define MEM_RSRC_PRINTK_SIZE 10
|
|
#endif
|
|
static const struct printf_spec io_spec = {
|
|
.base = 16,
|
|
.field_width = IO_RSRC_PRINTK_SIZE,
|
|
.precision = -1,
|
|
.flags = SPECIAL | SMALL | ZEROPAD,
|
|
};
|
|
static const struct printf_spec mem_spec = {
|
|
.base = 16,
|
|
.field_width = MEM_RSRC_PRINTK_SIZE,
|
|
.precision = -1,
|
|
.flags = SPECIAL | SMALL | ZEROPAD,
|
|
};
|
|
static const struct printf_spec bus_spec = {
|
|
.base = 16,
|
|
.field_width = 2,
|
|
.precision = -1,
|
|
.flags = SMALL | ZEROPAD,
|
|
};
|
|
static const struct printf_spec str_spec = {
|
|
.field_width = -1,
|
|
.precision = 10,
|
|
.flags = LEFT,
|
|
};
|
|
|
|
/* 32-bit res (sizeof==4): 10 chars in dec, 10 in hex ("0x" + 8)
|
|
* 64-bit res (sizeof==8): 20 chars in dec, 18 in hex ("0x" + 16) */
|
|
#define RSRC_BUF_SIZE ((2 * sizeof(resource_size_t)) + 4)
|
|
#define FLAG_BUF_SIZE (2 * sizeof(res->flags))
|
|
#define DECODED_BUF_SIZE sizeof("[mem - 64bit pref window disabled]")
|
|
#define RAW_BUF_SIZE sizeof("[mem - flags 0x]")
|
|
char sym[max(2*RSRC_BUF_SIZE + DECODED_BUF_SIZE,
|
|
2*RSRC_BUF_SIZE + FLAG_BUF_SIZE + RAW_BUF_SIZE)];
|
|
|
|
char *p = sym, *pend = sym + sizeof(sym);
|
|
int decode = (fmt[0] == 'R') ? 1 : 0;
|
|
const struct printf_spec *specp;
|
|
|
|
if (check_pointer(&buf, end, res, spec))
|
|
return buf;
|
|
|
|
*p++ = '[';
|
|
if (res->flags & IORESOURCE_IO) {
|
|
p = string_nocheck(p, pend, "io ", str_spec);
|
|
specp = &io_spec;
|
|
} else if (res->flags & IORESOURCE_MEM) {
|
|
p = string_nocheck(p, pend, "mem ", str_spec);
|
|
specp = &mem_spec;
|
|
} else if (res->flags & IORESOURCE_IRQ) {
|
|
p = string_nocheck(p, pend, "irq ", str_spec);
|
|
specp = &default_dec_spec;
|
|
} else if (res->flags & IORESOURCE_DMA) {
|
|
p = string_nocheck(p, pend, "dma ", str_spec);
|
|
specp = &default_dec_spec;
|
|
} else if (res->flags & IORESOURCE_BUS) {
|
|
p = string_nocheck(p, pend, "bus ", str_spec);
|
|
specp = &bus_spec;
|
|
} else {
|
|
p = string_nocheck(p, pend, "??? ", str_spec);
|
|
specp = &mem_spec;
|
|
decode = 0;
|
|
}
|
|
if (decode && res->flags & IORESOURCE_UNSET) {
|
|
p = string_nocheck(p, pend, "size ", str_spec);
|
|
p = number(p, pend, resource_size(res), *specp);
|
|
} else {
|
|
p = number(p, pend, res->start, *specp);
|
|
if (res->start != res->end) {
|
|
*p++ = '-';
|
|
p = number(p, pend, res->end, *specp);
|
|
}
|
|
}
|
|
if (decode) {
|
|
if (res->flags & IORESOURCE_MEM_64)
|
|
p = string_nocheck(p, pend, " 64bit", str_spec);
|
|
if (res->flags & IORESOURCE_PREFETCH)
|
|
p = string_nocheck(p, pend, " pref", str_spec);
|
|
if (res->flags & IORESOURCE_WINDOW)
|
|
p = string_nocheck(p, pend, " window", str_spec);
|
|
if (res->flags & IORESOURCE_DISABLED)
|
|
p = string_nocheck(p, pend, " disabled", str_spec);
|
|
} else {
|
|
p = string_nocheck(p, pend, " flags ", str_spec);
|
|
p = number(p, pend, res->flags, default_flag_spec);
|
|
}
|
|
*p++ = ']';
|
|
*p = '\0';
|
|
|
|
return string_nocheck(buf, end, sym, spec);
|
|
}
|
|
|
|
static noinline_for_stack
|
|
char *hex_string(char *buf, char *end, u8 *addr, struct printf_spec spec,
|
|
const char *fmt)
|
|
{
|
|
int i, len = 1; /* if we pass '%ph[CDN]', field width remains
|
|
negative value, fallback to the default */
|
|
char separator;
|
|
|
|
if (spec.field_width == 0)
|
|
/* nothing to print */
|
|
return buf;
|
|
|
|
if (check_pointer(&buf, end, addr, spec))
|
|
return buf;
|
|
|
|
switch (fmt[1]) {
|
|
case 'C':
|
|
separator = ':';
|
|
break;
|
|
case 'D':
|
|
separator = '-';
|
|
break;
|
|
case 'N':
|
|
separator = 0;
|
|
break;
|
|
default:
|
|
separator = ' ';
|
|
break;
|
|
}
|
|
|
|
if (spec.field_width > 0)
|
|
len = min_t(int, spec.field_width, 64);
|
|
|
|
for (i = 0; i < len; ++i) {
|
|
if (buf < end)
|
|
*buf = hex_asc_hi(addr[i]);
|
|
++buf;
|
|
if (buf < end)
|
|
*buf = hex_asc_lo(addr[i]);
|
|
++buf;
|
|
|
|
if (separator && i != len - 1) {
|
|
if (buf < end)
|
|
*buf = separator;
|
|
++buf;
|
|
}
|
|
}
|
|
|
|
return buf;
|
|
}
|
|
|
|
static noinline_for_stack
|
|
char *bitmap_string(char *buf, char *end, unsigned long *bitmap,
|
|
struct printf_spec spec, const char *fmt)
|
|
{
|
|
const int CHUNKSZ = 32;
|
|
int nr_bits = max_t(int, spec.field_width, 0);
|
|
int i, chunksz;
|
|
bool first = true;
|
|
|
|
if (check_pointer(&buf, end, bitmap, spec))
|
|
return buf;
|
|
|
|
/* reused to print numbers */
|
|
spec = (struct printf_spec){ .flags = SMALL | ZEROPAD, .base = 16 };
|
|
|
|
chunksz = nr_bits & (CHUNKSZ - 1);
|
|
if (chunksz == 0)
|
|
chunksz = CHUNKSZ;
|
|
|
|
i = ALIGN(nr_bits, CHUNKSZ) - CHUNKSZ;
|
|
for (; i >= 0; i -= CHUNKSZ) {
|
|
u32 chunkmask, val;
|
|
int word, bit;
|
|
|
|
chunkmask = ((1ULL << chunksz) - 1);
|
|
word = i / BITS_PER_LONG;
|
|
bit = i % BITS_PER_LONG;
|
|
val = (bitmap[word] >> bit) & chunkmask;
|
|
|
|
if (!first) {
|
|
if (buf < end)
|
|
*buf = ',';
|
|
buf++;
|
|
}
|
|
first = false;
|
|
|
|
spec.field_width = DIV_ROUND_UP(chunksz, 4);
|
|
buf = number(buf, end, val, spec);
|
|
|
|
chunksz = CHUNKSZ;
|
|
}
|
|
return buf;
|
|
}
|
|
|
|
static noinline_for_stack
|
|
char *bitmap_list_string(char *buf, char *end, unsigned long *bitmap,
|
|
struct printf_spec spec, const char *fmt)
|
|
{
|
|
int nr_bits = max_t(int, spec.field_width, 0);
|
|
/* current bit is 'cur', most recently seen range is [rbot, rtop] */
|
|
int cur, rbot, rtop;
|
|
bool first = true;
|
|
|
|
if (check_pointer(&buf, end, bitmap, spec))
|
|
return buf;
|
|
|
|
rbot = cur = find_first_bit(bitmap, nr_bits);
|
|
while (cur < nr_bits) {
|
|
rtop = cur;
|
|
cur = find_next_bit(bitmap, nr_bits, cur + 1);
|
|
if (cur < nr_bits && cur <= rtop + 1)
|
|
continue;
|
|
|
|
if (!first) {
|
|
if (buf < end)
|
|
*buf = ',';
|
|
buf++;
|
|
}
|
|
first = false;
|
|
|
|
buf = number(buf, end, rbot, default_dec_spec);
|
|
if (rbot < rtop) {
|
|
if (buf < end)
|
|
*buf = '-';
|
|
buf++;
|
|
|
|
buf = number(buf, end, rtop, default_dec_spec);
|
|
}
|
|
|
|
rbot = cur;
|
|
}
|
|
return buf;
|
|
}
|
|
|
|
static noinline_for_stack
|
|
char *mac_address_string(char *buf, char *end, u8 *addr,
|
|
struct printf_spec spec, const char *fmt)
|
|
{
|
|
char mac_addr[sizeof("xx:xx:xx:xx:xx:xx")];
|
|
char *p = mac_addr;
|
|
int i;
|
|
char separator;
|
|
bool reversed = false;
|
|
|
|
if (check_pointer(&buf, end, addr, spec))
|
|
return buf;
|
|
|
|
switch (fmt[1]) {
|
|
case 'F':
|
|
separator = '-';
|
|
break;
|
|
|
|
case 'R':
|
|
reversed = true;
|
|
/* fall through */
|
|
|
|
default:
|
|
separator = ':';
|
|
break;
|
|
}
|
|
|
|
for (i = 0; i < 6; i++) {
|
|
if (reversed)
|
|
p = hex_byte_pack(p, addr[5 - i]);
|
|
else
|
|
p = hex_byte_pack(p, addr[i]);
|
|
|
|
if (fmt[0] == 'M' && i != 5)
|
|
*p++ = separator;
|
|
}
|
|
*p = '\0';
|
|
|
|
return string_nocheck(buf, end, mac_addr, spec);
|
|
}
|
|
|
|
static noinline_for_stack
|
|
char *ip4_string(char *p, const u8 *addr, const char *fmt)
|
|
{
|
|
int i;
|
|
bool leading_zeros = (fmt[0] == 'i');
|
|
int index;
|
|
int step;
|
|
|
|
switch (fmt[2]) {
|
|
case 'h':
|
|
#ifdef __BIG_ENDIAN
|
|
index = 0;
|
|
step = 1;
|
|
#else
|
|
index = 3;
|
|
step = -1;
|
|
#endif
|
|
break;
|
|
case 'l':
|
|
index = 3;
|
|
step = -1;
|
|
break;
|
|
case 'n':
|
|
case 'b':
|
|
default:
|
|
index = 0;
|
|
step = 1;
|
|
break;
|
|
}
|
|
for (i = 0; i < 4; i++) {
|
|
char temp[4] __aligned(2); /* hold each IP quad in reverse order */
|
|
int digits = put_dec_trunc8(temp, addr[index]) - temp;
|
|
if (leading_zeros) {
|
|
if (digits < 3)
|
|
*p++ = '0';
|
|
if (digits < 2)
|
|
*p++ = '0';
|
|
}
|
|
/* reverse the digits in the quad */
|
|
while (digits--)
|
|
*p++ = temp[digits];
|
|
if (i < 3)
|
|
*p++ = '.';
|
|
index += step;
|
|
}
|
|
*p = '\0';
|
|
|
|
return p;
|
|
}
|
|
|
|
static noinline_for_stack
|
|
char *ip6_compressed_string(char *p, const char *addr)
|
|
{
|
|
int i, j, range;
|
|
unsigned char zerolength[8];
|
|
int longest = 1;
|
|
int colonpos = -1;
|
|
u16 word;
|
|
u8 hi, lo;
|
|
bool needcolon = false;
|
|
bool useIPv4;
|
|
struct in6_addr in6;
|
|
|
|
memcpy(&in6, addr, sizeof(struct in6_addr));
|
|
|
|
useIPv4 = ipv6_addr_v4mapped(&in6) || ipv6_addr_is_isatap(&in6);
|
|
|
|
memset(zerolength, 0, sizeof(zerolength));
|
|
|
|
if (useIPv4)
|
|
range = 6;
|
|
else
|
|
range = 8;
|
|
|
|
/* find position of longest 0 run */
|
|
for (i = 0; i < range; i++) {
|
|
for (j = i; j < range; j++) {
|
|
if (in6.s6_addr16[j] != 0)
|
|
break;
|
|
zerolength[i]++;
|
|
}
|
|
}
|
|
for (i = 0; i < range; i++) {
|
|
if (zerolength[i] > longest) {
|
|
longest = zerolength[i];
|
|
colonpos = i;
|
|
}
|
|
}
|
|
if (longest == 1) /* don't compress a single 0 */
|
|
colonpos = -1;
|
|
|
|
/* emit address */
|
|
for (i = 0; i < range; i++) {
|
|
if (i == colonpos) {
|
|
if (needcolon || i == 0)
|
|
*p++ = ':';
|
|
*p++ = ':';
|
|
needcolon = false;
|
|
i += longest - 1;
|
|
continue;
|
|
}
|
|
if (needcolon) {
|
|
*p++ = ':';
|
|
needcolon = false;
|
|
}
|
|
/* hex u16 without leading 0s */
|
|
word = ntohs(in6.s6_addr16[i]);
|
|
hi = word >> 8;
|
|
lo = word & 0xff;
|
|
if (hi) {
|
|
if (hi > 0x0f)
|
|
p = hex_byte_pack(p, hi);
|
|
else
|
|
*p++ = hex_asc_lo(hi);
|
|
p = hex_byte_pack(p, lo);
|
|
}
|
|
else if (lo > 0x0f)
|
|
p = hex_byte_pack(p, lo);
|
|
else
|
|
*p++ = hex_asc_lo(lo);
|
|
needcolon = true;
|
|
}
|
|
|
|
if (useIPv4) {
|
|
if (needcolon)
|
|
*p++ = ':';
|
|
p = ip4_string(p, &in6.s6_addr[12], "I4");
|
|
}
|
|
*p = '\0';
|
|
|
|
return p;
|
|
}
|
|
|
|
static noinline_for_stack
|
|
char *ip6_string(char *p, const char *addr, const char *fmt)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < 8; i++) {
|
|
p = hex_byte_pack(p, *addr++);
|
|
p = hex_byte_pack(p, *addr++);
|
|
if (fmt[0] == 'I' && i != 7)
|
|
*p++ = ':';
|
|
}
|
|
*p = '\0';
|
|
|
|
return p;
|
|
}
|
|
|
|
static noinline_for_stack
|
|
char *ip6_addr_string(char *buf, char *end, const u8 *addr,
|
|
struct printf_spec spec, const char *fmt)
|
|
{
|
|
char ip6_addr[sizeof("xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:255.255.255.255")];
|
|
|
|
if (fmt[0] == 'I' && fmt[2] == 'c')
|
|
ip6_compressed_string(ip6_addr, addr);
|
|
else
|
|
ip6_string(ip6_addr, addr, fmt);
|
|
|
|
return string_nocheck(buf, end, ip6_addr, spec);
|
|
}
|
|
|
|
static noinline_for_stack
|
|
char *ip4_addr_string(char *buf, char *end, const u8 *addr,
|
|
struct printf_spec spec, const char *fmt)
|
|
{
|
|
char ip4_addr[sizeof("255.255.255.255")];
|
|
|
|
ip4_string(ip4_addr, addr, fmt);
|
|
|
|
return string_nocheck(buf, end, ip4_addr, spec);
|
|
}
|
|
|
|
static noinline_for_stack
|
|
char *ip6_addr_string_sa(char *buf, char *end, const struct sockaddr_in6 *sa,
|
|
struct printf_spec spec, const char *fmt)
|
|
{
|
|
bool have_p = false, have_s = false, have_f = false, have_c = false;
|
|
char ip6_addr[sizeof("[xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:255.255.255.255]") +
|
|
sizeof(":12345") + sizeof("/123456789") +
|
|
sizeof("%1234567890")];
|
|
char *p = ip6_addr, *pend = ip6_addr + sizeof(ip6_addr);
|
|
const u8 *addr = (const u8 *) &sa->sin6_addr;
|
|
char fmt6[2] = { fmt[0], '6' };
|
|
u8 off = 0;
|
|
|
|
fmt++;
|
|
while (isalpha(*++fmt)) {
|
|
switch (*fmt) {
|
|
case 'p':
|
|
have_p = true;
|
|
break;
|
|
case 'f':
|
|
have_f = true;
|
|
break;
|
|
case 's':
|
|
have_s = true;
|
|
break;
|
|
case 'c':
|
|
have_c = true;
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (have_p || have_s || have_f) {
|
|
*p = '[';
|
|
off = 1;
|
|
}
|
|
|
|
if (fmt6[0] == 'I' && have_c)
|
|
p = ip6_compressed_string(ip6_addr + off, addr);
|
|
else
|
|
p = ip6_string(ip6_addr + off, addr, fmt6);
|
|
|
|
if (have_p || have_s || have_f)
|
|
*p++ = ']';
|
|
|
|
if (have_p) {
|
|
*p++ = ':';
|
|
p = number(p, pend, ntohs(sa->sin6_port), spec);
|
|
}
|
|
if (have_f) {
|
|
*p++ = '/';
|
|
p = number(p, pend, ntohl(sa->sin6_flowinfo &
|
|
IPV6_FLOWINFO_MASK), spec);
|
|
}
|
|
if (have_s) {
|
|
*p++ = '%';
|
|
p = number(p, pend, sa->sin6_scope_id, spec);
|
|
}
|
|
*p = '\0';
|
|
|
|
return string_nocheck(buf, end, ip6_addr, spec);
|
|
}
|
|
|
|
static noinline_for_stack
|
|
char *ip4_addr_string_sa(char *buf, char *end, const struct sockaddr_in *sa,
|
|
struct printf_spec spec, const char *fmt)
|
|
{
|
|
bool have_p = false;
|
|
char *p, ip4_addr[sizeof("255.255.255.255") + sizeof(":12345")];
|
|
char *pend = ip4_addr + sizeof(ip4_addr);
|
|
const u8 *addr = (const u8 *) &sa->sin_addr.s_addr;
|
|
char fmt4[3] = { fmt[0], '4', 0 };
|
|
|
|
fmt++;
|
|
while (isalpha(*++fmt)) {
|
|
switch (*fmt) {
|
|
case 'p':
|
|
have_p = true;
|
|
break;
|
|
case 'h':
|
|
case 'l':
|
|
case 'n':
|
|
case 'b':
|
|
fmt4[2] = *fmt;
|
|
break;
|
|
}
|
|
}
|
|
|
|
p = ip4_string(ip4_addr, addr, fmt4);
|
|
if (have_p) {
|
|
*p++ = ':';
|
|
p = number(p, pend, ntohs(sa->sin_port), spec);
|
|
}
|
|
*p = '\0';
|
|
|
|
return string_nocheck(buf, end, ip4_addr, spec);
|
|
}
|
|
|
|
static noinline_for_stack
|
|
char *ip_addr_string(char *buf, char *end, const void *ptr,
|
|
struct printf_spec spec, const char *fmt)
|
|
{
|
|
char *err_fmt_msg;
|
|
|
|
if (check_pointer(&buf, end, ptr, spec))
|
|
return buf;
|
|
|
|
switch (fmt[1]) {
|
|
case '6':
|
|
return ip6_addr_string(buf, end, ptr, spec, fmt);
|
|
case '4':
|
|
return ip4_addr_string(buf, end, ptr, spec, fmt);
|
|
case 'S': {
|
|
const union {
|
|
struct sockaddr raw;
|
|
struct sockaddr_in v4;
|
|
struct sockaddr_in6 v6;
|
|
} *sa = ptr;
|
|
|
|
switch (sa->raw.sa_family) {
|
|
case AF_INET:
|
|
return ip4_addr_string_sa(buf, end, &sa->v4, spec, fmt);
|
|
case AF_INET6:
|
|
return ip6_addr_string_sa(buf, end, &sa->v6, spec, fmt);
|
|
default:
|
|
return error_string(buf, end, "(einval)", spec);
|
|
}}
|
|
}
|
|
|
|
err_fmt_msg = fmt[0] == 'i' ? "(%pi?)" : "(%pI?)";
|
|
return error_string(buf, end, err_fmt_msg, spec);
|
|
}
|
|
|
|
static noinline_for_stack
|
|
char *escaped_string(char *buf, char *end, u8 *addr, struct printf_spec spec,
|
|
const char *fmt)
|
|
{
|
|
bool found = true;
|
|
int count = 1;
|
|
unsigned int flags = 0;
|
|
int len;
|
|
|
|
if (spec.field_width == 0)
|
|
return buf; /* nothing to print */
|
|
|
|
if (check_pointer(&buf, end, addr, spec))
|
|
return buf;
|
|
|
|
do {
|
|
switch (fmt[count++]) {
|
|
case 'a':
|
|
flags |= ESCAPE_ANY;
|
|
break;
|
|
case 'c':
|
|
flags |= ESCAPE_SPECIAL;
|
|
break;
|
|
case 'h':
|
|
flags |= ESCAPE_HEX;
|
|
break;
|
|
case 'n':
|
|
flags |= ESCAPE_NULL;
|
|
break;
|
|
case 'o':
|
|
flags |= ESCAPE_OCTAL;
|
|
break;
|
|
case 'p':
|
|
flags |= ESCAPE_NP;
|
|
break;
|
|
case 's':
|
|
flags |= ESCAPE_SPACE;
|
|
break;
|
|
default:
|
|
found = false;
|
|
break;
|
|
}
|
|
} while (found);
|
|
|
|
if (!flags)
|
|
flags = ESCAPE_ANY_NP;
|
|
|
|
len = spec.field_width < 0 ? 1 : spec.field_width;
|
|
|
|
/*
|
|
* string_escape_mem() writes as many characters as it can to
|
|
* the given buffer, and returns the total size of the output
|
|
* had the buffer been big enough.
|
|
*/
|
|
buf += string_escape_mem(addr, len, buf, buf < end ? end - buf : 0, flags, NULL);
|
|
|
|
return buf;
|
|
}
|
|
|
|
static char *va_format(char *buf, char *end, struct va_format *va_fmt,
|
|
struct printf_spec spec, const char *fmt)
|
|
{
|
|
va_list va;
|
|
|
|
if (check_pointer(&buf, end, va_fmt, spec))
|
|
return buf;
|
|
|
|
va_copy(va, *va_fmt->va);
|
|
buf += vsnprintf(buf, end > buf ? end - buf : 0, va_fmt->fmt, va);
|
|
va_end(va);
|
|
|
|
return buf;
|
|
}
|
|
|
|
static noinline_for_stack
|
|
char *uuid_string(char *buf, char *end, const u8 *addr,
|
|
struct printf_spec spec, const char *fmt)
|
|
{
|
|
char uuid[UUID_STRING_LEN + 1];
|
|
char *p = uuid;
|
|
int i;
|
|
const u8 *index = uuid_index;
|
|
bool uc = false;
|
|
|
|
if (check_pointer(&buf, end, addr, spec))
|
|
return buf;
|
|
|
|
switch (*(++fmt)) {
|
|
case 'L':
|
|
uc = true; /* fall-through */
|
|
case 'l':
|
|
index = guid_index;
|
|
break;
|
|
case 'B':
|
|
uc = true;
|
|
break;
|
|
}
|
|
|
|
for (i = 0; i < 16; i++) {
|
|
if (uc)
|
|
p = hex_byte_pack_upper(p, addr[index[i]]);
|
|
else
|
|
p = hex_byte_pack(p, addr[index[i]]);
|
|
switch (i) {
|
|
case 3:
|
|
case 5:
|
|
case 7:
|
|
case 9:
|
|
*p++ = '-';
|
|
break;
|
|
}
|
|
}
|
|
|
|
*p = 0;
|
|
|
|
return string_nocheck(buf, end, uuid, spec);
|
|
}
|
|
|
|
static noinline_for_stack
|
|
char *netdev_bits(char *buf, char *end, const void *addr,
|
|
struct printf_spec spec, const char *fmt)
|
|
{
|
|
unsigned long long num;
|
|
int size;
|
|
|
|
if (check_pointer(&buf, end, addr, spec))
|
|
return buf;
|
|
|
|
switch (fmt[1]) {
|
|
case 'F':
|
|
num = *(const netdev_features_t *)addr;
|
|
size = sizeof(netdev_features_t);
|
|
break;
|
|
default:
|
|
return error_string(buf, end, "(%pN?)", spec);
|
|
}
|
|
|
|
return special_hex_number(buf, end, num, size);
|
|
}
|
|
|
|
static noinline_for_stack
|
|
char *address_val(char *buf, char *end, const void *addr,
|
|
struct printf_spec spec, const char *fmt)
|
|
{
|
|
unsigned long long num;
|
|
int size;
|
|
|
|
if (check_pointer(&buf, end, addr, spec))
|
|
return buf;
|
|
|
|
switch (fmt[1]) {
|
|
case 'd':
|
|
num = *(const dma_addr_t *)addr;
|
|
size = sizeof(dma_addr_t);
|
|
break;
|
|
case 'p':
|
|
default:
|
|
num = *(const phys_addr_t *)addr;
|
|
size = sizeof(phys_addr_t);
|
|
break;
|
|
}
|
|
|
|
return special_hex_number(buf, end, num, size);
|
|
}
|
|
|
|
static noinline_for_stack
|
|
char *date_str(char *buf, char *end, const struct rtc_time *tm, bool r)
|
|
{
|
|
int year = tm->tm_year + (r ? 0 : 1900);
|
|
int mon = tm->tm_mon + (r ? 0 : 1);
|
|
|
|
buf = number(buf, end, year, default_dec04_spec);
|
|
if (buf < end)
|
|
*buf = '-';
|
|
buf++;
|
|
|
|
buf = number(buf, end, mon, default_dec02_spec);
|
|
if (buf < end)
|
|
*buf = '-';
|
|
buf++;
|
|
|
|
return number(buf, end, tm->tm_mday, default_dec02_spec);
|
|
}
|
|
|
|
static noinline_for_stack
|
|
char *time_str(char *buf, char *end, const struct rtc_time *tm, bool r)
|
|
{
|
|
buf = number(buf, end, tm->tm_hour, default_dec02_spec);
|
|
if (buf < end)
|
|
*buf = ':';
|
|
buf++;
|
|
|
|
buf = number(buf, end, tm->tm_min, default_dec02_spec);
|
|
if (buf < end)
|
|
*buf = ':';
|
|
buf++;
|
|
|
|
return number(buf, end, tm->tm_sec, default_dec02_spec);
|
|
}
|
|
|
|
static noinline_for_stack
|
|
char *rtc_str(char *buf, char *end, const struct rtc_time *tm,
|
|
struct printf_spec spec, const char *fmt)
|
|
{
|
|
bool have_t = true, have_d = true;
|
|
bool raw = false;
|
|
int count = 2;
|
|
|
|
if (check_pointer(&buf, end, tm, spec))
|
|
return buf;
|
|
|
|
switch (fmt[count]) {
|
|
case 'd':
|
|
have_t = false;
|
|
count++;
|
|
break;
|
|
case 't':
|
|
have_d = false;
|
|
count++;
|
|
break;
|
|
}
|
|
|
|
raw = fmt[count] == 'r';
|
|
|
|
if (have_d)
|
|
buf = date_str(buf, end, tm, raw);
|
|
if (have_d && have_t) {
|
|
/* Respect ISO 8601 */
|
|
if (buf < end)
|
|
*buf = 'T';
|
|
buf++;
|
|
}
|
|
if (have_t)
|
|
buf = time_str(buf, end, tm, raw);
|
|
|
|
return buf;
|
|
}
|
|
|
|
static noinline_for_stack
|
|
char *time_and_date(char *buf, char *end, void *ptr, struct printf_spec spec,
|
|
const char *fmt)
|
|
{
|
|
switch (fmt[1]) {
|
|
case 'R':
|
|
return rtc_str(buf, end, (const struct rtc_time *)ptr, spec, fmt);
|
|
default:
|
|
return error_string(buf, end, "(%ptR?)", spec);
|
|
}
|
|
}
|
|
|
|
static noinline_for_stack
|
|
char *clock(char *buf, char *end, struct clk *clk, struct printf_spec spec,
|
|
const char *fmt)
|
|
{
|
|
if (!IS_ENABLED(CONFIG_HAVE_CLK))
|
|
return error_string(buf, end, "(%pC?)", spec);
|
|
|
|
if (check_pointer(&buf, end, clk, spec))
|
|
return buf;
|
|
|
|
switch (fmt[1]) {
|
|
case 'n':
|
|
default:
|
|
#ifdef CONFIG_COMMON_CLK
|
|
return string(buf, end, __clk_get_name(clk), spec);
|
|
#else
|
|
return ptr_to_id(buf, end, clk, spec);
|
|
#endif
|
|
}
|
|
}
|
|
|
|
static
|
|
char *format_flags(char *buf, char *end, unsigned long flags,
|
|
const struct trace_print_flags *names)
|
|
{
|
|
unsigned long mask;
|
|
|
|
for ( ; flags && names->name; names++) {
|
|
mask = names->mask;
|
|
if ((flags & mask) != mask)
|
|
continue;
|
|
|
|
buf = string(buf, end, names->name, default_str_spec);
|
|
|
|
flags &= ~mask;
|
|
if (flags) {
|
|
if (buf < end)
|
|
*buf = '|';
|
|
buf++;
|
|
}
|
|
}
|
|
|
|
if (flags)
|
|
buf = number(buf, end, flags, default_flag_spec);
|
|
|
|
return buf;
|
|
}
|
|
|
|
static noinline_for_stack
|
|
char *flags_string(char *buf, char *end, void *flags_ptr,
|
|
struct printf_spec spec, const char *fmt)
|
|
{
|
|
unsigned long flags;
|
|
const struct trace_print_flags *names;
|
|
|
|
if (check_pointer(&buf, end, flags_ptr, spec))
|
|
return buf;
|
|
|
|
switch (fmt[1]) {
|
|
case 'p':
|
|
flags = *(unsigned long *)flags_ptr;
|
|
/* Remove zone id */
|
|
flags &= (1UL << NR_PAGEFLAGS) - 1;
|
|
names = pageflag_names;
|
|
break;
|
|
case 'v':
|
|
flags = *(unsigned long *)flags_ptr;
|
|
names = vmaflag_names;
|
|
break;
|
|
case 'g':
|
|
flags = *(gfp_t *)flags_ptr;
|
|
names = gfpflag_names;
|
|
break;
|
|
default:
|
|
return error_string(buf, end, "(%pG?)", spec);
|
|
}
|
|
|
|
return format_flags(buf, end, flags, names);
|
|
}
|
|
|
|
static const char *device_node_name_for_depth(const struct device_node *np, int depth)
|
|
{
|
|
for ( ; np && depth; depth--)
|
|
np = np->parent;
|
|
|
|
return kbasename(np->full_name);
|
|
}
|
|
|
|
static noinline_for_stack
|
|
char *device_node_gen_full_name(const struct device_node *np, char *buf, char *end)
|
|
{
|
|
int depth;
|
|
const struct device_node *parent = np->parent;
|
|
|
|
/* special case for root node */
|
|
if (!parent)
|
|
return string_nocheck(buf, end, "/", default_str_spec);
|
|
|
|
for (depth = 0; parent->parent; depth++)
|
|
parent = parent->parent;
|
|
|
|
for ( ; depth >= 0; depth--) {
|
|
buf = string_nocheck(buf, end, "/", default_str_spec);
|
|
buf = string(buf, end, device_node_name_for_depth(np, depth),
|
|
default_str_spec);
|
|
}
|
|
return buf;
|
|
}
|
|
|
|
static noinline_for_stack
|
|
char *device_node_string(char *buf, char *end, struct device_node *dn,
|
|
struct printf_spec spec, const char *fmt)
|
|
{
|
|
char tbuf[sizeof("xxxx") + 1];
|
|
const char *p;
|
|
int ret;
|
|
char *buf_start = buf;
|
|
struct property *prop;
|
|
bool has_mult, pass;
|
|
static const struct printf_spec num_spec = {
|
|
.flags = SMALL,
|
|
.field_width = -1,
|
|
.precision = -1,
|
|
.base = 10,
|
|
};
|
|
|
|
struct printf_spec str_spec = spec;
|
|
str_spec.field_width = -1;
|
|
|
|
if (!IS_ENABLED(CONFIG_OF))
|
|
return error_string(buf, end, "(%pOF?)", spec);
|
|
|
|
if (check_pointer(&buf, end, dn, spec))
|
|
return buf;
|
|
|
|
/* simple case without anything any more format specifiers */
|
|
fmt++;
|
|
if (fmt[0] == '\0' || strcspn(fmt,"fnpPFcC") > 0)
|
|
fmt = "f";
|
|
|
|
for (pass = false; strspn(fmt,"fnpPFcC"); fmt++, pass = true) {
|
|
int precision;
|
|
if (pass) {
|
|
if (buf < end)
|
|
*buf = ':';
|
|
buf++;
|
|
}
|
|
|
|
switch (*fmt) {
|
|
case 'f': /* full_name */
|
|
buf = device_node_gen_full_name(dn, buf, end);
|
|
break;
|
|
case 'n': /* name */
|
|
p = kbasename(of_node_full_name(dn));
|
|
precision = str_spec.precision;
|
|
str_spec.precision = strchrnul(p, '@') - p;
|
|
buf = string(buf, end, p, str_spec);
|
|
str_spec.precision = precision;
|
|
break;
|
|
case 'p': /* phandle */
|
|
buf = number(buf, end, (unsigned int)dn->phandle, num_spec);
|
|
break;
|
|
case 'P': /* path-spec */
|
|
p = kbasename(of_node_full_name(dn));
|
|
if (!p[1])
|
|
p = "/";
|
|
buf = string(buf, end, p, str_spec);
|
|
break;
|
|
case 'F': /* flags */
|
|
tbuf[0] = of_node_check_flag(dn, OF_DYNAMIC) ? 'D' : '-';
|
|
tbuf[1] = of_node_check_flag(dn, OF_DETACHED) ? 'd' : '-';
|
|
tbuf[2] = of_node_check_flag(dn, OF_POPULATED) ? 'P' : '-';
|
|
tbuf[3] = of_node_check_flag(dn, OF_POPULATED_BUS) ? 'B' : '-';
|
|
tbuf[4] = 0;
|
|
buf = string_nocheck(buf, end, tbuf, str_spec);
|
|
break;
|
|
case 'c': /* major compatible string */
|
|
ret = of_property_read_string(dn, "compatible", &p);
|
|
if (!ret)
|
|
buf = string(buf, end, p, str_spec);
|
|
break;
|
|
case 'C': /* full compatible string */
|
|
has_mult = false;
|
|
of_property_for_each_string(dn, "compatible", prop, p) {
|
|
if (has_mult)
|
|
buf = string_nocheck(buf, end, ",", str_spec);
|
|
buf = string_nocheck(buf, end, "\"", str_spec);
|
|
buf = string(buf, end, p, str_spec);
|
|
buf = string_nocheck(buf, end, "\"", str_spec);
|
|
|
|
has_mult = true;
|
|
}
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
|
|
return widen_string(buf, buf - buf_start, end, spec);
|
|
}
|
|
|
|
static char *kobject_string(char *buf, char *end, void *ptr,
|
|
struct printf_spec spec, const char *fmt)
|
|
{
|
|
switch (fmt[1]) {
|
|
case 'F':
|
|
return device_node_string(buf, end, ptr, spec, fmt + 1);
|
|
}
|
|
|
|
return error_string(buf, end, "(%pO?)", spec);
|
|
}
|
|
|
|
/*
|
|
* Show a '%p' thing. A kernel extension is that the '%p' is followed
|
|
* by an extra set of alphanumeric characters that are extended format
|
|
* specifiers.
|
|
*
|
|
* Please update scripts/checkpatch.pl when adding/removing conversion
|
|
* characters. (Search for "check for vsprintf extension").
|
|
*
|
|
* Right now we handle:
|
|
*
|
|
* - 'S' For symbolic direct pointers (or function descriptors) with offset
|
|
* - 's' For symbolic direct pointers (or function descriptors) without offset
|
|
* - 'F' Same as 'S'
|
|
* - 'f' Same as 's'
|
|
* - '[FfSs]R' as above with __builtin_extract_return_addr() translation
|
|
* - 'B' For backtraced symbolic direct pointers with offset
|
|
* - 'R' For decoded struct resource, e.g., [mem 0x0-0x1f 64bit pref]
|
|
* - 'r' For raw struct resource, e.g., [mem 0x0-0x1f flags 0x201]
|
|
* - 'b[l]' For a bitmap, the number of bits is determined by the field
|
|
* width which must be explicitly specified either as part of the
|
|
* format string '%32b[l]' or through '%*b[l]', [l] selects
|
|
* range-list format instead of hex format
|
|
* - 'M' For a 6-byte MAC address, it prints the address in the
|
|
* usual colon-separated hex notation
|
|
* - 'm' For a 6-byte MAC address, it prints the hex address without colons
|
|
* - 'MF' For a 6-byte MAC FDDI address, it prints the address
|
|
* with a dash-separated hex notation
|
|
* - '[mM]R' For a 6-byte MAC address, Reverse order (Bluetooth)
|
|
* - 'I' [46] for IPv4/IPv6 addresses printed in the usual way
|
|
* IPv4 uses dot-separated decimal without leading 0's (1.2.3.4)
|
|
* IPv6 uses colon separated network-order 16 bit hex with leading 0's
|
|
* [S][pfs]
|
|
* Generic IPv4/IPv6 address (struct sockaddr *) that falls back to
|
|
* [4] or [6] and is able to print port [p], flowinfo [f], scope [s]
|
|
* - 'i' [46] for 'raw' IPv4/IPv6 addresses
|
|
* IPv6 omits the colons (01020304...0f)
|
|
* IPv4 uses dot-separated decimal with leading 0's (010.123.045.006)
|
|
* [S][pfs]
|
|
* Generic IPv4/IPv6 address (struct sockaddr *) that falls back to
|
|
* [4] or [6] and is able to print port [p], flowinfo [f], scope [s]
|
|
* - '[Ii][4S][hnbl]' IPv4 addresses in host, network, big or little endian order
|
|
* - 'I[6S]c' for IPv6 addresses printed as specified by
|
|
* http://tools.ietf.org/html/rfc5952
|
|
* - 'E[achnops]' For an escaped buffer, where rules are defined by combination
|
|
* of the following flags (see string_escape_mem() for the
|
|
* details):
|
|
* a - ESCAPE_ANY
|
|
* c - ESCAPE_SPECIAL
|
|
* h - ESCAPE_HEX
|
|
* n - ESCAPE_NULL
|
|
* o - ESCAPE_OCTAL
|
|
* p - ESCAPE_NP
|
|
* s - ESCAPE_SPACE
|
|
* By default ESCAPE_ANY_NP is used.
|
|
* - 'U' For a 16 byte UUID/GUID, it prints the UUID/GUID in the form
|
|
* "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
|
|
* Options for %pU are:
|
|
* b big endian lower case hex (default)
|
|
* B big endian UPPER case hex
|
|
* l little endian lower case hex
|
|
* L little endian UPPER case hex
|
|
* big endian output byte order is:
|
|
* [0][1][2][3]-[4][5]-[6][7]-[8][9]-[10][11][12][13][14][15]
|
|
* little endian output byte order is:
|
|
* [3][2][1][0]-[5][4]-[7][6]-[8][9]-[10][11][12][13][14][15]
|
|
* - 'V' For a struct va_format which contains a format string * and va_list *,
|
|
* call vsnprintf(->format, *->va_list).
|
|
* Implements a "recursive vsnprintf".
|
|
* Do not use this feature without some mechanism to verify the
|
|
* correctness of the format string and va_list arguments.
|
|
* - 'K' For a kernel pointer that should be hidden from unprivileged users
|
|
* - 'NF' For a netdev_features_t
|
|
* - 'h[CDN]' For a variable-length buffer, it prints it as a hex string with
|
|
* a certain separator (' ' by default):
|
|
* C colon
|
|
* D dash
|
|
* N no separator
|
|
* The maximum supported length is 64 bytes of the input. Consider
|
|
* to use print_hex_dump() for the larger input.
|
|
* - 'a[pd]' For address types [p] phys_addr_t, [d] dma_addr_t and derivatives
|
|
* (default assumed to be phys_addr_t, passed by reference)
|
|
* - 'd[234]' For a dentry name (optionally 2-4 last components)
|
|
* - 'D[234]' Same as 'd' but for a struct file
|
|
* - 'g' For block_device name (gendisk + partition number)
|
|
* - 't[R][dt][r]' For time and date as represented:
|
|
* R struct rtc_time
|
|
* - 'C' For a clock, it prints the name (Common Clock Framework) or address
|
|
* (legacy clock framework) of the clock
|
|
* - 'Cn' For a clock, it prints the name (Common Clock Framework) or address
|
|
* (legacy clock framework) of the clock
|
|
* - 'G' For flags to be printed as a collection of symbolic strings that would
|
|
* construct the specific value. Supported flags given by option:
|
|
* p page flags (see struct page) given as pointer to unsigned long
|
|
* g gfp flags (GFP_* and __GFP_*) given as pointer to gfp_t
|
|
* v vma flags (VM_*) given as pointer to unsigned long
|
|
* - 'OF[fnpPcCF]' For a device tree object
|
|
* Without any optional arguments prints the full_name
|
|
* f device node full_name
|
|
* n device node name
|
|
* p device node phandle
|
|
* P device node path spec (name + @unit)
|
|
* F device node flags
|
|
* c major compatible string
|
|
* C full compatible string
|
|
* - 'x' For printing the address. Equivalent to "%lx".
|
|
*
|
|
* ** When making changes please also update:
|
|
* Documentation/core-api/printk-formats.rst
|
|
*
|
|
* Note: The default behaviour (unadorned %p) is to hash the address,
|
|
* rendering it useful as a unique identifier.
|
|
*/
|
|
static noinline_for_stack
|
|
char *pointer(const char *fmt, char *buf, char *end, void *ptr,
|
|
struct printf_spec spec)
|
|
{
|
|
switch (*fmt) {
|
|
case 'F':
|
|
case 'f':
|
|
case 'S':
|
|
case 's':
|
|
ptr = dereference_symbol_descriptor(ptr);
|
|
/* Fallthrough */
|
|
case 'B':
|
|
return symbol_string(buf, end, ptr, spec, fmt);
|
|
case 'R':
|
|
case 'r':
|
|
return resource_string(buf, end, ptr, spec, fmt);
|
|
case 'h':
|
|
return hex_string(buf, end, ptr, spec, fmt);
|
|
case 'b':
|
|
switch (fmt[1]) {
|
|
case 'l':
|
|
return bitmap_list_string(buf, end, ptr, spec, fmt);
|
|
default:
|
|
return bitmap_string(buf, end, ptr, spec, fmt);
|
|
}
|
|
case 'M': /* Colon separated: 00:01:02:03:04:05 */
|
|
case 'm': /* Contiguous: 000102030405 */
|
|
/* [mM]F (FDDI) */
|
|
/* [mM]R (Reverse order; Bluetooth) */
|
|
return mac_address_string(buf, end, ptr, spec, fmt);
|
|
case 'I': /* Formatted IP supported
|
|
* 4: 1.2.3.4
|
|
* 6: 0001:0203:...:0708
|
|
* 6c: 1::708 or 1::1.2.3.4
|
|
*/
|
|
case 'i': /* Contiguous:
|
|
* 4: 001.002.003.004
|
|
* 6: 000102...0f
|
|
*/
|
|
return ip_addr_string(buf, end, ptr, spec, fmt);
|
|
case 'E':
|
|
return escaped_string(buf, end, ptr, spec, fmt);
|
|
case 'U':
|
|
return uuid_string(buf, end, ptr, spec, fmt);
|
|
case 'V':
|
|
return va_format(buf, end, ptr, spec, fmt);
|
|
case 'K':
|
|
if (IS_ENABLED(CONFIG_DEBUG_CONSOLE_UNHASHED_POINTERS))
|
|
break;
|
|
return restricted_pointer(buf, end, ptr, spec);
|
|
case 'N':
|
|
return netdev_bits(buf, end, ptr, spec, fmt);
|
|
case 'a':
|
|
return address_val(buf, end, ptr, spec, fmt);
|
|
case 'd':
|
|
return dentry_name(buf, end, ptr, spec, fmt);
|
|
case 't':
|
|
return time_and_date(buf, end, ptr, spec, fmt);
|
|
case 'C':
|
|
return clock(buf, end, ptr, spec, fmt);
|
|
case 'D':
|
|
return file_dentry_name(buf, end, ptr, spec, fmt);
|
|
#ifdef CONFIG_BLOCK
|
|
case 'g':
|
|
return bdev_name(buf, end, ptr, spec, fmt);
|
|
#endif
|
|
|
|
case 'G':
|
|
return flags_string(buf, end, ptr, spec, fmt);
|
|
case 'O':
|
|
return kobject_string(buf, end, ptr, spec, fmt);
|
|
case 'x':
|
|
return pointer_string(buf, end, ptr, spec);
|
|
}
|
|
|
|
if (IS_ENABLED(CONFIG_DEBUG_CONSOLE_UNHASHED_POINTERS))
|
|
return pointer_string(buf, end, ptr, spec);
|
|
|
|
/* default is to _not_ leak addresses, hash before printing */
|
|
return ptr_to_id(buf, end, ptr, spec);
|
|
}
|
|
|
|
/*
|
|
* Helper function to decode printf style format.
|
|
* Each call decode a token from the format and return the
|
|
* number of characters read (or likely the delta where it wants
|
|
* to go on the next call).
|
|
* The decoded token is returned through the parameters
|
|
*
|
|
* 'h', 'l', or 'L' for integer fields
|
|
* 'z' support added 23/7/1999 S.H.
|
|
* 'z' changed to 'Z' --davidm 1/25/99
|
|
* 'Z' changed to 'z' --adobriyan 2017-01-25
|
|
* 't' added for ptrdiff_t
|
|
*
|
|
* @fmt: the format string
|
|
* @type of the token returned
|
|
* @flags: various flags such as +, -, # tokens..
|
|
* @field_width: overwritten width
|
|
* @base: base of the number (octal, hex, ...)
|
|
* @precision: precision of a number
|
|
* @qualifier: qualifier of a number (long, size_t, ...)
|
|
*/
|
|
static noinline_for_stack
|
|
int format_decode(const char *fmt, struct printf_spec *spec)
|
|
{
|
|
const char *start = fmt;
|
|
char qualifier;
|
|
|
|
/* we finished early by reading the field width */
|
|
if (spec->type == FORMAT_TYPE_WIDTH) {
|
|
if (spec->field_width < 0) {
|
|
spec->field_width = -spec->field_width;
|
|
spec->flags |= LEFT;
|
|
}
|
|
spec->type = FORMAT_TYPE_NONE;
|
|
goto precision;
|
|
}
|
|
|
|
/* we finished early by reading the precision */
|
|
if (spec->type == FORMAT_TYPE_PRECISION) {
|
|
if (spec->precision < 0)
|
|
spec->precision = 0;
|
|
|
|
spec->type = FORMAT_TYPE_NONE;
|
|
goto qualifier;
|
|
}
|
|
|
|
/* By default */
|
|
spec->type = FORMAT_TYPE_NONE;
|
|
|
|
for (; *fmt ; ++fmt) {
|
|
if (*fmt == '%')
|
|
break;
|
|
}
|
|
|
|
/* Return the current non-format string */
|
|
if (fmt != start || !*fmt)
|
|
return fmt - start;
|
|
|
|
/* Process flags */
|
|
spec->flags = 0;
|
|
|
|
while (1) { /* this also skips first '%' */
|
|
bool found = true;
|
|
|
|
++fmt;
|
|
|
|
switch (*fmt) {
|
|
case '-': spec->flags |= LEFT; break;
|
|
case '+': spec->flags |= PLUS; break;
|
|
case ' ': spec->flags |= SPACE; break;
|
|
case '#': spec->flags |= SPECIAL; break;
|
|
case '0': spec->flags |= ZEROPAD; break;
|
|
default: found = false;
|
|
}
|
|
|
|
if (!found)
|
|
break;
|
|
}
|
|
|
|
/* get field width */
|
|
spec->field_width = -1;
|
|
|
|
if (isdigit(*fmt))
|
|
spec->field_width = skip_atoi(&fmt);
|
|
else if (*fmt == '*') {
|
|
/* it's the next argument */
|
|
spec->type = FORMAT_TYPE_WIDTH;
|
|
return ++fmt - start;
|
|
}
|
|
|
|
precision:
|
|
/* get the precision */
|
|
spec->precision = -1;
|
|
if (*fmt == '.') {
|
|
++fmt;
|
|
if (isdigit(*fmt)) {
|
|
spec->precision = skip_atoi(&fmt);
|
|
if (spec->precision < 0)
|
|
spec->precision = 0;
|
|
} else if (*fmt == '*') {
|
|
/* it's the next argument */
|
|
spec->type = FORMAT_TYPE_PRECISION;
|
|
return ++fmt - start;
|
|
}
|
|
}
|
|
|
|
qualifier:
|
|
/* get the conversion qualifier */
|
|
qualifier = 0;
|
|
if (*fmt == 'h' || _tolower(*fmt) == 'l' ||
|
|
*fmt == 'z' || *fmt == 't') {
|
|
qualifier = *fmt++;
|
|
if (unlikely(qualifier == *fmt)) {
|
|
if (qualifier == 'l') {
|
|
qualifier = 'L';
|
|
++fmt;
|
|
} else if (qualifier == 'h') {
|
|
qualifier = 'H';
|
|
++fmt;
|
|
}
|
|
}
|
|
}
|
|
|
|
/* default base */
|
|
spec->base = 10;
|
|
switch (*fmt) {
|
|
case 'c':
|
|
spec->type = FORMAT_TYPE_CHAR;
|
|
return ++fmt - start;
|
|
|
|
case 's':
|
|
spec->type = FORMAT_TYPE_STR;
|
|
return ++fmt - start;
|
|
|
|
case 'p':
|
|
spec->type = FORMAT_TYPE_PTR;
|
|
return ++fmt - start;
|
|
|
|
case '%':
|
|
spec->type = FORMAT_TYPE_PERCENT_CHAR;
|
|
return ++fmt - start;
|
|
|
|
/* integer number formats - set up the flags and "break" */
|
|
case 'o':
|
|
spec->base = 8;
|
|
break;
|
|
|
|
case 'x':
|
|
spec->flags |= SMALL;
|
|
/* fall through */
|
|
|
|
case 'X':
|
|
spec->base = 16;
|
|
break;
|
|
|
|
case 'd':
|
|
case 'i':
|
|
spec->flags |= SIGN;
|
|
case 'u':
|
|
break;
|
|
|
|
case 'n':
|
|
/*
|
|
* Since %n poses a greater security risk than
|
|
* utility, treat it as any other invalid or
|
|
* unsupported format specifier.
|
|
*/
|
|
/* Fall-through */
|
|
|
|
default:
|
|
WARN_ONCE(1, "Please remove unsupported %%%c in format string\n", *fmt);
|
|
spec->type = FORMAT_TYPE_INVALID;
|
|
return fmt - start;
|
|
}
|
|
|
|
if (qualifier == 'L')
|
|
spec->type = FORMAT_TYPE_LONG_LONG;
|
|
else if (qualifier == 'l') {
|
|
BUILD_BUG_ON(FORMAT_TYPE_ULONG + SIGN != FORMAT_TYPE_LONG);
|
|
spec->type = FORMAT_TYPE_ULONG + (spec->flags & SIGN);
|
|
} else if (qualifier == 'z') {
|
|
spec->type = FORMAT_TYPE_SIZE_T;
|
|
} else if (qualifier == 't') {
|
|
spec->type = FORMAT_TYPE_PTRDIFF;
|
|
} else if (qualifier == 'H') {
|
|
BUILD_BUG_ON(FORMAT_TYPE_UBYTE + SIGN != FORMAT_TYPE_BYTE);
|
|
spec->type = FORMAT_TYPE_UBYTE + (spec->flags & SIGN);
|
|
} else if (qualifier == 'h') {
|
|
BUILD_BUG_ON(FORMAT_TYPE_USHORT + SIGN != FORMAT_TYPE_SHORT);
|
|
spec->type = FORMAT_TYPE_USHORT + (spec->flags & SIGN);
|
|
} else {
|
|
BUILD_BUG_ON(FORMAT_TYPE_UINT + SIGN != FORMAT_TYPE_INT);
|
|
spec->type = FORMAT_TYPE_UINT + (spec->flags & SIGN);
|
|
}
|
|
|
|
return ++fmt - start;
|
|
}
|
|
|
|
static void
|
|
set_field_width(struct printf_spec *spec, int width)
|
|
{
|
|
spec->field_width = width;
|
|
if (WARN_ONCE(spec->field_width != width, "field width %d too large", width)) {
|
|
spec->field_width = clamp(width, -FIELD_WIDTH_MAX, FIELD_WIDTH_MAX);
|
|
}
|
|
}
|
|
|
|
static void
|
|
set_precision(struct printf_spec *spec, int prec)
|
|
{
|
|
spec->precision = prec;
|
|
if (WARN_ONCE(spec->precision != prec, "precision %d too large", prec)) {
|
|
spec->precision = clamp(prec, 0, PRECISION_MAX);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* vsnprintf - Format a string and place it in a buffer
|
|
* @buf: The buffer to place the result into
|
|
* @size: The size of the buffer, including the trailing null space
|
|
* @fmt: The format string to use
|
|
* @args: Arguments for the format string
|
|
*
|
|
* This function generally follows C99 vsnprintf, but has some
|
|
* extensions and a few limitations:
|
|
*
|
|
* - ``%n`` is unsupported
|
|
* - ``%p*`` is handled by pointer()
|
|
*
|
|
* See pointer() or Documentation/core-api/printk-formats.rst for more
|
|
* extensive description.
|
|
*
|
|
* **Please update the documentation in both places when making changes**
|
|
*
|
|
* The return value is the number of characters which would
|
|
* be generated for the given input, excluding the trailing
|
|
* '\0', as per ISO C99. If you want to have the exact
|
|
* number of characters written into @buf as return value
|
|
* (not including the trailing '\0'), use vscnprintf(). If the
|
|
* return is greater than or equal to @size, the resulting
|
|
* string is truncated.
|
|
*
|
|
* If you're not already dealing with a va_list consider using snprintf().
|
|
*/
|
|
int vsnprintf(char *buf, size_t size, const char *fmt, va_list args)
|
|
{
|
|
unsigned long long num;
|
|
char *str, *end;
|
|
struct printf_spec spec = {0};
|
|
|
|
/* Reject out-of-range values early. Large positive sizes are
|
|
used for unknown buffer sizes. */
|
|
if (WARN_ON_ONCE(size > INT_MAX))
|
|
return 0;
|
|
|
|
str = buf;
|
|
end = buf + size;
|
|
|
|
/* Make sure end is always >= buf */
|
|
if (end < buf) {
|
|
end = ((void *)-1);
|
|
size = end - buf;
|
|
}
|
|
|
|
while (*fmt) {
|
|
const char *old_fmt = fmt;
|
|
int read = format_decode(fmt, &spec);
|
|
|
|
fmt += read;
|
|
|
|
switch (spec.type) {
|
|
case FORMAT_TYPE_NONE: {
|
|
int copy = read;
|
|
if (str < end) {
|
|
if (copy > end - str)
|
|
copy = end - str;
|
|
memcpy(str, old_fmt, copy);
|
|
}
|
|
str += read;
|
|
break;
|
|
}
|
|
|
|
case FORMAT_TYPE_WIDTH:
|
|
set_field_width(&spec, va_arg(args, int));
|
|
break;
|
|
|
|
case FORMAT_TYPE_PRECISION:
|
|
set_precision(&spec, va_arg(args, int));
|
|
break;
|
|
|
|
case FORMAT_TYPE_CHAR: {
|
|
char c;
|
|
|
|
if (!(spec.flags & LEFT)) {
|
|
while (--spec.field_width > 0) {
|
|
if (str < end)
|
|
*str = ' ';
|
|
++str;
|
|
|
|
}
|
|
}
|
|
c = (unsigned char) va_arg(args, int);
|
|
if (str < end)
|
|
*str = c;
|
|
++str;
|
|
while (--spec.field_width > 0) {
|
|
if (str < end)
|
|
*str = ' ';
|
|
++str;
|
|
}
|
|
break;
|
|
}
|
|
|
|
case FORMAT_TYPE_STR:
|
|
str = string(str, end, va_arg(args, char *), spec);
|
|
break;
|
|
|
|
case FORMAT_TYPE_PTR:
|
|
str = pointer(fmt, str, end, va_arg(args, void *),
|
|
spec);
|
|
while (isalnum(*fmt))
|
|
fmt++;
|
|
break;
|
|
|
|
case FORMAT_TYPE_PERCENT_CHAR:
|
|
if (str < end)
|
|
*str = '%';
|
|
++str;
|
|
break;
|
|
|
|
case FORMAT_TYPE_INVALID:
|
|
/*
|
|
* Presumably the arguments passed gcc's type
|
|
* checking, but there is no safe or sane way
|
|
* for us to continue parsing the format and
|
|
* fetching from the va_list; the remaining
|
|
* specifiers and arguments would be out of
|
|
* sync.
|
|
*/
|
|
goto out;
|
|
|
|
default:
|
|
switch (spec.type) {
|
|
case FORMAT_TYPE_LONG_LONG:
|
|
num = va_arg(args, long long);
|
|
break;
|
|
case FORMAT_TYPE_ULONG:
|
|
num = va_arg(args, unsigned long);
|
|
break;
|
|
case FORMAT_TYPE_LONG:
|
|
num = va_arg(args, long);
|
|
break;
|
|
case FORMAT_TYPE_SIZE_T:
|
|
if (spec.flags & SIGN)
|
|
num = va_arg(args, ssize_t);
|
|
else
|
|
num = va_arg(args, size_t);
|
|
break;
|
|
case FORMAT_TYPE_PTRDIFF:
|
|
num = va_arg(args, ptrdiff_t);
|
|
break;
|
|
case FORMAT_TYPE_UBYTE:
|
|
num = (unsigned char) va_arg(args, int);
|
|
break;
|
|
case FORMAT_TYPE_BYTE:
|
|
num = (signed char) va_arg(args, int);
|
|
break;
|
|
case FORMAT_TYPE_USHORT:
|
|
num = (unsigned short) va_arg(args, int);
|
|
break;
|
|
case FORMAT_TYPE_SHORT:
|
|
num = (short) va_arg(args, int);
|
|
break;
|
|
case FORMAT_TYPE_INT:
|
|
num = (int) va_arg(args, int);
|
|
break;
|
|
default:
|
|
num = va_arg(args, unsigned int);
|
|
}
|
|
|
|
str = number(str, end, num, spec);
|
|
}
|
|
}
|
|
|
|
out:
|
|
if (size > 0) {
|
|
if (str < end)
|
|
*str = '\0';
|
|
else
|
|
end[-1] = '\0';
|
|
}
|
|
|
|
/* the trailing null byte doesn't count towards the total */
|
|
return str-buf;
|
|
|
|
}
|
|
EXPORT_SYMBOL(vsnprintf);
|
|
|
|
/**
|
|
* vscnprintf - Format a string and place it in a buffer
|
|
* @buf: The buffer to place the result into
|
|
* @size: The size of the buffer, including the trailing null space
|
|
* @fmt: The format string to use
|
|
* @args: Arguments for the format string
|
|
*
|
|
* The return value is the number of characters which have been written into
|
|
* the @buf not including the trailing '\0'. If @size is == 0 the function
|
|
* returns 0.
|
|
*
|
|
* If you're not already dealing with a va_list consider using scnprintf().
|
|
*
|
|
* See the vsnprintf() documentation for format string extensions over C99.
|
|
*/
|
|
int vscnprintf(char *buf, size_t size, const char *fmt, va_list args)
|
|
{
|
|
int i;
|
|
|
|
i = vsnprintf(buf, size, fmt, args);
|
|
|
|
if (likely(i < size))
|
|
return i;
|
|
if (size != 0)
|
|
return size - 1;
|
|
return 0;
|
|
}
|
|
EXPORT_SYMBOL(vscnprintf);
|
|
|
|
/**
|
|
* snprintf - Format a string and place it in a buffer
|
|
* @buf: The buffer to place the result into
|
|
* @size: The size of the buffer, including the trailing null space
|
|
* @fmt: The format string to use
|
|
* @...: Arguments for the format string
|
|
*
|
|
* The return value is the number of characters which would be
|
|
* generated for the given input, excluding the trailing null,
|
|
* as per ISO C99. If the return is greater than or equal to
|
|
* @size, the resulting string is truncated.
|
|
*
|
|
* See the vsnprintf() documentation for format string extensions over C99.
|
|
*/
|
|
int snprintf(char *buf, size_t size, const char *fmt, ...)
|
|
{
|
|
va_list args;
|
|
int i;
|
|
|
|
va_start(args, fmt);
|
|
i = vsnprintf(buf, size, fmt, args);
|
|
va_end(args);
|
|
|
|
return i;
|
|
}
|
|
EXPORT_SYMBOL(snprintf);
|
|
|
|
/**
|
|
* scnprintf - Format a string and place it in a buffer
|
|
* @buf: The buffer to place the result into
|
|
* @size: The size of the buffer, including the trailing null space
|
|
* @fmt: The format string to use
|
|
* @...: Arguments for the format string
|
|
*
|
|
* The return value is the number of characters written into @buf not including
|
|
* the trailing '\0'. If @size is == 0 the function returns 0.
|
|
*/
|
|
|
|
int scnprintf(char *buf, size_t size, const char *fmt, ...)
|
|
{
|
|
va_list args;
|
|
int i;
|
|
|
|
va_start(args, fmt);
|
|
i = vscnprintf(buf, size, fmt, args);
|
|
va_end(args);
|
|
|
|
return i;
|
|
}
|
|
EXPORT_SYMBOL(scnprintf);
|
|
|
|
/**
|
|
* vsprintf - Format a string and place it in a buffer
|
|
* @buf: The buffer to place the result into
|
|
* @fmt: The format string to use
|
|
* @args: Arguments for the format string
|
|
*
|
|
* The function returns the number of characters written
|
|
* into @buf. Use vsnprintf() or vscnprintf() in order to avoid
|
|
* buffer overflows.
|
|
*
|
|
* If you're not already dealing with a va_list consider using sprintf().
|
|
*
|
|
* See the vsnprintf() documentation for format string extensions over C99.
|
|
*/
|
|
int vsprintf(char *buf, const char *fmt, va_list args)
|
|
{
|
|
return vsnprintf(buf, INT_MAX, fmt, args);
|
|
}
|
|
EXPORT_SYMBOL(vsprintf);
|
|
|
|
/**
|
|
* sprintf - Format a string and place it in a buffer
|
|
* @buf: The buffer to place the result into
|
|
* @fmt: The format string to use
|
|
* @...: Arguments for the format string
|
|
*
|
|
* The function returns the number of characters written
|
|
* into @buf. Use snprintf() or scnprintf() in order to avoid
|
|
* buffer overflows.
|
|
*
|
|
* See the vsnprintf() documentation for format string extensions over C99.
|
|
*/
|
|
int sprintf(char *buf, const char *fmt, ...)
|
|
{
|
|
va_list args;
|
|
int i;
|
|
|
|
va_start(args, fmt);
|
|
i = vsnprintf(buf, INT_MAX, fmt, args);
|
|
va_end(args);
|
|
|
|
return i;
|
|
}
|
|
EXPORT_SYMBOL(sprintf);
|
|
|
|
#ifdef CONFIG_BINARY_PRINTF
|
|
/*
|
|
* bprintf service:
|
|
* vbin_printf() - VA arguments to binary data
|
|
* bstr_printf() - Binary data to text string
|
|
*/
|
|
|
|
/**
|
|
* vbin_printf - Parse a format string and place args' binary value in a buffer
|
|
* @bin_buf: The buffer to place args' binary value
|
|
* @size: The size of the buffer(by words(32bits), not characters)
|
|
* @fmt: The format string to use
|
|
* @args: Arguments for the format string
|
|
*
|
|
* The format follows C99 vsnprintf, except %n is ignored, and its argument
|
|
* is skipped.
|
|
*
|
|
* The return value is the number of words(32bits) which would be generated for
|
|
* the given input.
|
|
*
|
|
* NOTE:
|
|
* If the return value is greater than @size, the resulting bin_buf is NOT
|
|
* valid for bstr_printf().
|
|
*/
|
|
int vbin_printf(u32 *bin_buf, size_t size, const char *fmt, va_list args)
|
|
{
|
|
struct printf_spec spec = {0};
|
|
char *str, *end;
|
|
int width;
|
|
|
|
str = (char *)bin_buf;
|
|
end = (char *)(bin_buf + size);
|
|
|
|
#define save_arg(type) \
|
|
({ \
|
|
unsigned long long value; \
|
|
if (sizeof(type) == 8) { \
|
|
unsigned long long val8; \
|
|
str = PTR_ALIGN(str, sizeof(u32)); \
|
|
val8 = va_arg(args, unsigned long long); \
|
|
if (str + sizeof(type) <= end) { \
|
|
*(u32 *)str = *(u32 *)&val8; \
|
|
*(u32 *)(str + 4) = *((u32 *)&val8 + 1); \
|
|
} \
|
|
value = val8; \
|
|
} else { \
|
|
unsigned int val4; \
|
|
str = PTR_ALIGN(str, sizeof(type)); \
|
|
val4 = va_arg(args, int); \
|
|
if (str + sizeof(type) <= end) \
|
|
*(typeof(type) *)str = (type)(long)val4; \
|
|
value = (unsigned long long)val4; \
|
|
} \
|
|
str += sizeof(type); \
|
|
value; \
|
|
})
|
|
|
|
while (*fmt) {
|
|
int read = format_decode(fmt, &spec);
|
|
|
|
fmt += read;
|
|
|
|
switch (spec.type) {
|
|
case FORMAT_TYPE_NONE:
|
|
case FORMAT_TYPE_PERCENT_CHAR:
|
|
break;
|
|
case FORMAT_TYPE_INVALID:
|
|
goto out;
|
|
|
|
case FORMAT_TYPE_WIDTH:
|
|
case FORMAT_TYPE_PRECISION:
|
|
width = (int)save_arg(int);
|
|
/* Pointers may require the width */
|
|
if (*fmt == 'p')
|
|
set_field_width(&spec, width);
|
|
break;
|
|
|
|
case FORMAT_TYPE_CHAR:
|
|
save_arg(char);
|
|
break;
|
|
|
|
case FORMAT_TYPE_STR: {
|
|
const char *save_str = va_arg(args, char *);
|
|
const char *err_msg;
|
|
size_t len;
|
|
|
|
err_msg = check_pointer_msg(save_str);
|
|
if (err_msg)
|
|
save_str = err_msg;
|
|
|
|
len = strlen(save_str) + 1;
|
|
if (str + len < end)
|
|
memcpy(str, save_str, len);
|
|
str += len;
|
|
break;
|
|
}
|
|
|
|
case FORMAT_TYPE_PTR:
|
|
/* Dereferenced pointers must be done now */
|
|
switch (*fmt) {
|
|
/* Dereference of functions is still OK */
|
|
case 'S':
|
|
case 's':
|
|
case 'F':
|
|
case 'f':
|
|
case 'x':
|
|
case 'K':
|
|
save_arg(void *);
|
|
break;
|
|
default:
|
|
if (!isalnum(*fmt)) {
|
|
save_arg(void *);
|
|
break;
|
|
}
|
|
str = pointer(fmt, str, end, va_arg(args, void *),
|
|
spec);
|
|
if (str + 1 < end)
|
|
*str++ = '\0';
|
|
else
|
|
end[-1] = '\0'; /* Must be nul terminated */
|
|
}
|
|
/* skip all alphanumeric pointer suffixes */
|
|
while (isalnum(*fmt))
|
|
fmt++;
|
|
break;
|
|
|
|
default:
|
|
switch (spec.type) {
|
|
|
|
case FORMAT_TYPE_LONG_LONG:
|
|
save_arg(long long);
|
|
break;
|
|
case FORMAT_TYPE_ULONG:
|
|
case FORMAT_TYPE_LONG:
|
|
save_arg(unsigned long);
|
|
break;
|
|
case FORMAT_TYPE_SIZE_T:
|
|
save_arg(size_t);
|
|
break;
|
|
case FORMAT_TYPE_PTRDIFF:
|
|
save_arg(ptrdiff_t);
|
|
break;
|
|
case FORMAT_TYPE_UBYTE:
|
|
case FORMAT_TYPE_BYTE:
|
|
save_arg(char);
|
|
break;
|
|
case FORMAT_TYPE_USHORT:
|
|
case FORMAT_TYPE_SHORT:
|
|
save_arg(short);
|
|
break;
|
|
default:
|
|
save_arg(int);
|
|
}
|
|
}
|
|
}
|
|
|
|
out:
|
|
return (u32 *)(PTR_ALIGN(str, sizeof(u32))) - bin_buf;
|
|
#undef save_arg
|
|
}
|
|
EXPORT_SYMBOL_GPL(vbin_printf);
|
|
|
|
/**
|
|
* bstr_printf - Format a string from binary arguments and place it in a buffer
|
|
* @buf: The buffer to place the result into
|
|
* @size: The size of the buffer, including the trailing null space
|
|
* @fmt: The format string to use
|
|
* @bin_buf: Binary arguments for the format string
|
|
*
|
|
* This function like C99 vsnprintf, but the difference is that vsnprintf gets
|
|
* arguments from stack, and bstr_printf gets arguments from @bin_buf which is
|
|
* a binary buffer that generated by vbin_printf.
|
|
*
|
|
* The format follows C99 vsnprintf, but has some extensions:
|
|
* see vsnprintf comment for details.
|
|
*
|
|
* The return value is the number of characters which would
|
|
* be generated for the given input, excluding the trailing
|
|
* '\0', as per ISO C99. If you want to have the exact
|
|
* number of characters written into @buf as return value
|
|
* (not including the trailing '\0'), use vscnprintf(). If the
|
|
* return is greater than or equal to @size, the resulting
|
|
* string is truncated.
|
|
*/
|
|
int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
|
|
{
|
|
struct printf_spec spec = {0};
|
|
char *str, *end;
|
|
const char *args = (const char *)bin_buf;
|
|
|
|
if (WARN_ON_ONCE(size > INT_MAX))
|
|
return 0;
|
|
|
|
str = buf;
|
|
end = buf + size;
|
|
|
|
#define get_arg(type) \
|
|
({ \
|
|
typeof(type) value; \
|
|
if (sizeof(type) == 8) { \
|
|
args = PTR_ALIGN(args, sizeof(u32)); \
|
|
*(u32 *)&value = *(u32 *)args; \
|
|
*((u32 *)&value + 1) = *(u32 *)(args + 4); \
|
|
} else { \
|
|
args = PTR_ALIGN(args, sizeof(type)); \
|
|
value = *(typeof(type) *)args; \
|
|
} \
|
|
args += sizeof(type); \
|
|
value; \
|
|
})
|
|
|
|
/* Make sure end is always >= buf */
|
|
if (end < buf) {
|
|
end = ((void *)-1);
|
|
size = end - buf;
|
|
}
|
|
|
|
while (*fmt) {
|
|
const char *old_fmt = fmt;
|
|
int read = format_decode(fmt, &spec);
|
|
|
|
fmt += read;
|
|
|
|
switch (spec.type) {
|
|
case FORMAT_TYPE_NONE: {
|
|
int copy = read;
|
|
if (str < end) {
|
|
if (copy > end - str)
|
|
copy = end - str;
|
|
memcpy(str, old_fmt, copy);
|
|
}
|
|
str += read;
|
|
break;
|
|
}
|
|
|
|
case FORMAT_TYPE_WIDTH:
|
|
set_field_width(&spec, get_arg(int));
|
|
break;
|
|
|
|
case FORMAT_TYPE_PRECISION:
|
|
set_precision(&spec, get_arg(int));
|
|
break;
|
|
|
|
case FORMAT_TYPE_CHAR: {
|
|
char c;
|
|
|
|
if (!(spec.flags & LEFT)) {
|
|
while (--spec.field_width > 0) {
|
|
if (str < end)
|
|
*str = ' ';
|
|
++str;
|
|
}
|
|
}
|
|
c = (unsigned char) get_arg(char);
|
|
if (str < end)
|
|
*str = c;
|
|
++str;
|
|
while (--spec.field_width > 0) {
|
|
if (str < end)
|
|
*str = ' ';
|
|
++str;
|
|
}
|
|
break;
|
|
}
|
|
|
|
case FORMAT_TYPE_STR: {
|
|
const char *str_arg = args;
|
|
args += strlen(str_arg) + 1;
|
|
str = string(str, end, (char *)str_arg, spec);
|
|
break;
|
|
}
|
|
|
|
case FORMAT_TYPE_PTR: {
|
|
bool process = false;
|
|
int copy, len;
|
|
/* Non function dereferences were already done */
|
|
switch (*fmt) {
|
|
case 'S':
|
|
case 's':
|
|
case 'F':
|
|
case 'f':
|
|
case 'x':
|
|
case 'K':
|
|
process = true;
|
|
break;
|
|
default:
|
|
if (!isalnum(*fmt)) {
|
|
process = true;
|
|
break;
|
|
}
|
|
/* Pointer dereference was already processed */
|
|
if (str < end) {
|
|
len = copy = strlen(args);
|
|
if (copy > end - str)
|
|
copy = end - str;
|
|
memcpy(str, args, copy);
|
|
str += len;
|
|
args += len + 1;
|
|
}
|
|
}
|
|
if (process)
|
|
str = pointer(fmt, str, end, get_arg(void *), spec);
|
|
|
|
while (isalnum(*fmt))
|
|
fmt++;
|
|
break;
|
|
}
|
|
|
|
case FORMAT_TYPE_PERCENT_CHAR:
|
|
if (str < end)
|
|
*str = '%';
|
|
++str;
|
|
break;
|
|
|
|
case FORMAT_TYPE_INVALID:
|
|
goto out;
|
|
|
|
default: {
|
|
unsigned long long num;
|
|
|
|
switch (spec.type) {
|
|
|
|
case FORMAT_TYPE_LONG_LONG:
|
|
num = get_arg(long long);
|
|
break;
|
|
case FORMAT_TYPE_ULONG:
|
|
case FORMAT_TYPE_LONG:
|
|
num = get_arg(unsigned long);
|
|
break;
|
|
case FORMAT_TYPE_SIZE_T:
|
|
num = get_arg(size_t);
|
|
break;
|
|
case FORMAT_TYPE_PTRDIFF:
|
|
num = get_arg(ptrdiff_t);
|
|
break;
|
|
case FORMAT_TYPE_UBYTE:
|
|
num = get_arg(unsigned char);
|
|
break;
|
|
case FORMAT_TYPE_BYTE:
|
|
num = get_arg(signed char);
|
|
break;
|
|
case FORMAT_TYPE_USHORT:
|
|
num = get_arg(unsigned short);
|
|
break;
|
|
case FORMAT_TYPE_SHORT:
|
|
num = get_arg(short);
|
|
break;
|
|
case FORMAT_TYPE_UINT:
|
|
num = get_arg(unsigned int);
|
|
break;
|
|
default:
|
|
num = get_arg(int);
|
|
}
|
|
|
|
str = number(str, end, num, spec);
|
|
} /* default: */
|
|
} /* switch(spec.type) */
|
|
} /* while(*fmt) */
|
|
|
|
out:
|
|
if (size > 0) {
|
|
if (str < end)
|
|
*str = '\0';
|
|
else
|
|
end[-1] = '\0';
|
|
}
|
|
|
|
#undef get_arg
|
|
|
|
/* the trailing null byte doesn't count towards the total */
|
|
return str - buf;
|
|
}
|
|
EXPORT_SYMBOL_GPL(bstr_printf);
|
|
|
|
/**
|
|
* bprintf - Parse a format string and place args' binary value in a buffer
|
|
* @bin_buf: The buffer to place args' binary value
|
|
* @size: The size of the buffer(by words(32bits), not characters)
|
|
* @fmt: The format string to use
|
|
* @...: Arguments for the format string
|
|
*
|
|
* The function returns the number of words(u32) written
|
|
* into @bin_buf.
|
|
*/
|
|
int bprintf(u32 *bin_buf, size_t size, const char *fmt, ...)
|
|
{
|
|
va_list args;
|
|
int ret;
|
|
|
|
va_start(args, fmt);
|
|
ret = vbin_printf(bin_buf, size, fmt, args);
|
|
va_end(args);
|
|
|
|
return ret;
|
|
}
|
|
EXPORT_SYMBOL_GPL(bprintf);
|
|
|
|
#endif /* CONFIG_BINARY_PRINTF */
|
|
|
|
/**
|
|
* vsscanf - Unformat a buffer into a list of arguments
|
|
* @buf: input buffer
|
|
* @fmt: format of buffer
|
|
* @args: arguments
|
|
*/
|
|
int vsscanf(const char *buf, const char *fmt, va_list args)
|
|
{
|
|
const char *str = buf;
|
|
char *next;
|
|
char digit;
|
|
int num = 0;
|
|
u8 qualifier;
|
|
unsigned int base;
|
|
union {
|
|
long long s;
|
|
unsigned long long u;
|
|
} val;
|
|
s16 field_width;
|
|
bool is_sign;
|
|
|
|
while (*fmt) {
|
|
/* skip any white space in format */
|
|
/* white space in format matchs any amount of
|
|
* white space, including none, in the input.
|
|
*/
|
|
if (isspace(*fmt)) {
|
|
fmt = skip_spaces(++fmt);
|
|
str = skip_spaces(str);
|
|
}
|
|
|
|
/* anything that is not a conversion must match exactly */
|
|
if (*fmt != '%' && *fmt) {
|
|
if (*fmt++ != *str++)
|
|
break;
|
|
continue;
|
|
}
|
|
|
|
if (!*fmt)
|
|
break;
|
|
++fmt;
|
|
|
|
/* skip this conversion.
|
|
* advance both strings to next white space
|
|
*/
|
|
if (*fmt == '*') {
|
|
if (!*str)
|
|
break;
|
|
while (!isspace(*fmt) && *fmt != '%' && *fmt) {
|
|
/* '%*[' not yet supported, invalid format */
|
|
if (*fmt == '[')
|
|
return num;
|
|
fmt++;
|
|
}
|
|
while (!isspace(*str) && *str)
|
|
str++;
|
|
continue;
|
|
}
|
|
|
|
/* get field width */
|
|
field_width = -1;
|
|
if (isdigit(*fmt)) {
|
|
field_width = skip_atoi(&fmt);
|
|
if (field_width <= 0)
|
|
break;
|
|
}
|
|
|
|
/* get conversion qualifier */
|
|
qualifier = -1;
|
|
if (*fmt == 'h' || _tolower(*fmt) == 'l' ||
|
|
*fmt == 'z') {
|
|
qualifier = *fmt++;
|
|
if (unlikely(qualifier == *fmt)) {
|
|
if (qualifier == 'h') {
|
|
qualifier = 'H';
|
|
fmt++;
|
|
} else if (qualifier == 'l') {
|
|
qualifier = 'L';
|
|
fmt++;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (!*fmt)
|
|
break;
|
|
|
|
if (*fmt == 'n') {
|
|
/* return number of characters read so far */
|
|
*va_arg(args, int *) = str - buf;
|
|
++fmt;
|
|
continue;
|
|
}
|
|
|
|
if (!*str)
|
|
break;
|
|
|
|
base = 10;
|
|
is_sign = false;
|
|
|
|
switch (*fmt++) {
|
|
case 'c':
|
|
{
|
|
char *s = (char *)va_arg(args, char*);
|
|
if (field_width == -1)
|
|
field_width = 1;
|
|
do {
|
|
*s++ = *str++;
|
|
} while (--field_width > 0 && *str);
|
|
num++;
|
|
}
|
|
continue;
|
|
case 's':
|
|
{
|
|
char *s = (char *)va_arg(args, char *);
|
|
if (field_width == -1)
|
|
field_width = SHRT_MAX;
|
|
/* first, skip leading white space in buffer */
|
|
str = skip_spaces(str);
|
|
|
|
/* now copy until next white space */
|
|
while (*str && !isspace(*str) && field_width--)
|
|
*s++ = *str++;
|
|
*s = '\0';
|
|
num++;
|
|
}
|
|
continue;
|
|
/*
|
|
* Warning: This implementation of the '[' conversion specifier
|
|
* deviates from its glibc counterpart in the following ways:
|
|
* (1) It does NOT support ranges i.e. '-' is NOT a special
|
|
* character
|
|
* (2) It cannot match the closing bracket ']' itself
|
|
* (3) A field width is required
|
|
* (4) '%*[' (discard matching input) is currently not supported
|
|
*
|
|
* Example usage:
|
|
* ret = sscanf("00:0a:95","%2[^:]:%2[^:]:%2[^:]",
|
|
* buf1, buf2, buf3);
|
|
* if (ret < 3)
|
|
* // etc..
|
|
*/
|
|
case '[':
|
|
{
|
|
char *s = (char *)va_arg(args, char *);
|
|
DECLARE_BITMAP(set, 256) = {0};
|
|
unsigned int len = 0;
|
|
bool negate = (*fmt == '^');
|
|
|
|
/* field width is required */
|
|
if (field_width == -1)
|
|
return num;
|
|
|
|
if (negate)
|
|
++fmt;
|
|
|
|
for ( ; *fmt && *fmt != ']'; ++fmt, ++len)
|
|
set_bit((u8)*fmt, set);
|
|
|
|
/* no ']' or no character set found */
|
|
if (!*fmt || !len)
|
|
return num;
|
|
++fmt;
|
|
|
|
if (negate) {
|
|
bitmap_complement(set, set, 256);
|
|
/* exclude null '\0' byte */
|
|
clear_bit(0, set);
|
|
}
|
|
|
|
/* match must be non-empty */
|
|
if (!test_bit((u8)*str, set))
|
|
return num;
|
|
|
|
while (test_bit((u8)*str, set) && field_width--)
|
|
*s++ = *str++;
|
|
*s = '\0';
|
|
++num;
|
|
}
|
|
continue;
|
|
case 'o':
|
|
base = 8;
|
|
break;
|
|
case 'x':
|
|
case 'X':
|
|
base = 16;
|
|
break;
|
|
case 'i':
|
|
base = 0;
|
|
/* fall through */
|
|
case 'd':
|
|
is_sign = true;
|
|
/* fall through */
|
|
case 'u':
|
|
break;
|
|
case '%':
|
|
/* looking for '%' in str */
|
|
if (*str++ != '%')
|
|
return num;
|
|
continue;
|
|
default:
|
|
/* invalid format; stop here */
|
|
return num;
|
|
}
|
|
|
|
/* have some sort of integer conversion.
|
|
* first, skip white space in buffer.
|
|
*/
|
|
str = skip_spaces(str);
|
|
|
|
digit = *str;
|
|
if (is_sign && digit == '-')
|
|
digit = *(str + 1);
|
|
|
|
if (!digit
|
|
|| (base == 16 && !isxdigit(digit))
|
|
|| (base == 10 && !isdigit(digit))
|
|
|| (base == 8 && (!isdigit(digit) || digit > '7'))
|
|
|| (base == 0 && !isdigit(digit)))
|
|
break;
|
|
|
|
if (is_sign)
|
|
val.s = qualifier != 'L' ?
|
|
simple_strtol(str, &next, base) :
|
|
simple_strtoll(str, &next, base);
|
|
else
|
|
val.u = qualifier != 'L' ?
|
|
simple_strtoul(str, &next, base) :
|
|
simple_strtoull(str, &next, base);
|
|
|
|
if (field_width > 0 && next - str > field_width) {
|
|
if (base == 0)
|
|
_parse_integer_fixup_radix(str, &base);
|
|
while (next - str > field_width) {
|
|
if (is_sign)
|
|
val.s = div_s64(val.s, base);
|
|
else
|
|
val.u = div_u64(val.u, base);
|
|
--next;
|
|
}
|
|
}
|
|
|
|
switch (qualifier) {
|
|
case 'H': /* that's 'hh' in format */
|
|
if (is_sign)
|
|
*va_arg(args, signed char *) = val.s;
|
|
else
|
|
*va_arg(args, unsigned char *) = val.u;
|
|
break;
|
|
case 'h':
|
|
if (is_sign)
|
|
*va_arg(args, short *) = val.s;
|
|
else
|
|
*va_arg(args, unsigned short *) = val.u;
|
|
break;
|
|
case 'l':
|
|
if (is_sign)
|
|
*va_arg(args, long *) = val.s;
|
|
else
|
|
*va_arg(args, unsigned long *) = val.u;
|
|
break;
|
|
case 'L':
|
|
if (is_sign)
|
|
*va_arg(args, long long *) = val.s;
|
|
else
|
|
*va_arg(args, unsigned long long *) = val.u;
|
|
break;
|
|
case 'z':
|
|
*va_arg(args, size_t *) = val.u;
|
|
break;
|
|
default:
|
|
if (is_sign)
|
|
*va_arg(args, int *) = val.s;
|
|
else
|
|
*va_arg(args, unsigned int *) = val.u;
|
|
break;
|
|
}
|
|
num++;
|
|
|
|
if (!next)
|
|
break;
|
|
str = next;
|
|
}
|
|
|
|
return num;
|
|
}
|
|
EXPORT_SYMBOL(vsscanf);
|
|
|
|
/**
|
|
* sscanf - Unformat a buffer into a list of arguments
|
|
* @buf: input buffer
|
|
* @fmt: formatting of buffer
|
|
* @...: resulting arguments
|
|
*/
|
|
int sscanf(const char *buf, const char *fmt, ...)
|
|
{
|
|
va_list args;
|
|
int i;
|
|
|
|
va_start(args, fmt);
|
|
i = vsscanf(buf, fmt, args);
|
|
va_end(args);
|
|
|
|
return i;
|
|
}
|
|
EXPORT_SYMBOL(sscanf);
|