Google Git
Sign in
android/kernel/common/ee0977df88b5641c7697f8152963c1602b44eb39
commit
ee0977df88b5641c7697f8152963c1602b44eb39
[log]
author
Greg Kroah-Hartman <gregkh@google.com>
Tue Feb 10 08:32:44 2026 +0000
committer
Greg Kroah-Hartman <gregkh@google.com>
Tue Feb 10 08:32:44 2026 +0000
tree
981d21f0903f6e16b8382345cbc89f6cd2884a5b
parent
9e12f802c524078d3309af29fceebe8eea9073e8 [diff]
parent
f92598df4891f970e86d207f358b4b22966bc647 [diff]
Merge 5.10.249 into android13-5.10-lts

Changes in 5.10.249
	pnfs/flexfiles: Fix memory leak in nfs4_ff_alloc_deviceid_node()
	nvmet-tcp: remove boilerplate code
	nvme-tcp: fix NULL pointer dereferences in nvmet_tcp_build_pdu_iovec
	ip6_tunnel: use skb_vlan_inet_prepare() in __ip6_tnl_rcv()
	macvlan: Add nodst option to macvlan type source
	macvlan: Use 'hash' iterators to simplify code
	macvlan: fix possible UAF in macvlan_forward_source()
	ipv4: ip_gre: make ipgre_header() robust
	vsock/test: add a final full barrier after run all tests
	net/sched: sch_qfq: do not free existing class in qfq_change_class()
	ASoC: tlv320adcx140: fix word length
	textsearch: describe @list member in ts_ops search
	dmaengine: tegra-adma: Fix use-after-free
	dmaengine: xilinx_dma: Fix uninitialized addr_width when "xlnx,addrwidth" property is missing
	phy: stm32-usphyc: Fix off by one in probe()
	phy: broadcom: ns-usb3: Fix Wvoid-pointer-to-enum-cast warning (again)
	dmaengine: omap-dma: fix dma_pool resource leak in error paths
	HID: usbhid: paper over wrong bNumDescriptor field
	ALSA: pcm: Improve the fix for race of buffer access at PCM OSS layer
	net: can: j1939: j1939_xtp_rx_rts_session_active(): deactivate session upon receiving the second rts
	phy: rockchip: inno-usb2: fix disconnection in gadget mode
	phy: rockchip: inno-usb2: fix communication disruption in gadget mode
	phy: tegra: xusb: Explicitly configure HS_DISCON_LEVEL to 0x7
	usb: dwc3: Check for USB4 IP_NAME
	USB: OHCI/UHCI: Add soft dependencies on ehci_platform
	USB: serial: option: add Telit LE910 MBIM composition
	USB: serial: ftdi_sio: add support for PICAXE AXE027 cable
	ext4: fix iloc.bh leak in ext4_xattr_inode_update_ref
	EDAC/x38: Fix a resource leak in x38_probe1()
	EDAC/i3200: Fix a resource leak in i3200_probe1()
	x86/resctrl: Fix memory bandwidth counter width for Hygon
	x86/resctrl: Add missing resctrl initialization for Hygon
	drm/nouveau/disp/nv50-: Set lock_core in curs507a_prepare
	drm/panel-simple: fix connector type for DataImage SCF0700C48GGU18 panel
	drm/vmwgfx: Fix an error return check in vmw_compat_shader_add()
	dmaengine: at_hdmac: fix device leak on of_dma_xlate()
	dmaengine: bcm-sba-raid: fix device leak on probe
	dmaengine: lpc18xx-dmamux: fix device leak on route allocation
	dmaengine: ti: dma-crossbar: fix device leak on dra7x route allocation
	dmaengine: ti: dma-crossbar: fix device leak on am335x route allocation
	dmaengine: ti: k3-udma: fix device leak on udma lookup
	btrfs: fix deadlock in wait_current_trans() due to ignored transaction type
	macvlan: Fix leaking skb in source mode with nodst option
	posix-clock: introduce posix_clock_context concept
	Fix memory leak in posix_clock_open()
	posix-clock: Store file pointer in struct posix_clock_context
	ptp: Add PHC file mode checks. Allow RO adjtime() without FMODE_WRITE.
	net: usb: dm9601: remove broken SR9700 support
	sctp: sm_statefuns: Fix spelling mistakes
	sctp: move SCTP_CMD_ASSOC_SHKEY right after SCTP_CMD_PEER_INIT
	amd-xgbe: avoid misleading per-packet error log
	gue: Fix skb memleak with inner IP protocol 0.
	netlink: add a proto specification for FOU
	net: fou: rename the source for linking
	net: fou: use policy and operation tables generated from the spec
	fou: Don't allow 0 for FOU_ATTR_IPPROTO.
	l2tp: avoid one data-race in l2tp_tunnel_del_work()
	ipvlan: Make the addrs_lock be per port
	net/sched: Enforce that teql can only be used as root qdisc
	net/sched: qfq: Use cl_is_active to determine whether class is active in qfq_rm_from_ag
	crypto: authencesn - reject too-short AAD (assoclen<8) to match ESP/ESN spec
	comedi: dmm32at: serialize use of paged registers
	w1: fix redundant counter decrement in w1_attach_slave_device()
	Input: i8042 - add quirks for MECHREVO Wujie 15X Pro
	Input: i8042 - add quirk for ASUS Zenbook UX425QA_UM425QA
	scsi: storvsc: Process unsupported MODE_SENSE_10
	staging:iio:adc:ad7280a: Register define cleanup.
	iio: adc: ad7280a: handle spi_setup() errors in probe()
	regmap: Fix race condition in hwspinlock irqsave routine
	scsi: core: Wake up the error handler when final completions race against each other
	ALSA: usb: Increase volume range that triggers a warning
	net: hns3: fix wrong GENMASK() for HCLGE_FD_AD_COUNTER_NUM_M
	net: hns3: fix the HCLGE_FD_AD_NXT_KEY error setting issue
	mISDN: annotate data-race around dev->work
	usbnet: limit max_mtu based on device's hard_mtu
	drm/amd/pm: Don't clear SI SMC table when setting power limit
	drm/amd/pm: Workaround SI powertune issue on Radeon 430 (v2)
	be2net: Fix NULL pointer dereference in be_cmd_get_mac_from_list
	bonding: provide a net pointer to __skb_flow_dissect()
	octeontx2-af: Fix error handling
	net/sched: act_ife: avoid possible NULL deref
	leds: led-class: Only Add LED to leds_list when it is fully ready
	of: fix reference count leak in of_alias_scan()
	iio: adc: ad9467: fix ad9434 vref mask
	iio: adc: at91-sama5d2_adc: Fix potential use-after-free in sama5d2_adc driver
	iio: dac: ad5686: add AD5695R to ad5686_chip_info_tbl
	ALSA: ctxfi: Fix potential OOB access in audio mixer handling
	ALSA: usb-audio: Fix use-after-free in snd_usb_mixer_free()
	mmc: rtsx_pci_sdmmc: implement sdmmc_card_busy function
	wifi: ath10k: fix dma_free_coherent() pointer
	wifi: mwifiex: Fix a loop in mwifiex_update_ampdu_rxwinsize()
	wifi: rsi: Fix memory corruption due to not set vif driver data size
	octeontx2: Fix otx2_dma_map_page() error return code
	slimbus: core: fix runtime PM imbalance on report present
	slimbus: core: fix device reference leak on report present
	intel_th: fix device leak on output open()
	uacce: fix cdev handling in the cleanup path
	uacce: implement mremap in uacce_vm_ops to return -EPERM
	uacce: ensure safe queue release with state management
	netrom: fix double-free in nr_route_frame()
	perf/x86/intel: Do not enable BTS for guests
	irqchip/gic-v3-its: Avoid truncating memory addresses
	can: ems_usb: ems_usb_read_bulk_callback(): fix URB memory leak
	can: kvaser_usb: kvaser_usb_read_bulk_callback(): fix URB memory leak
	can: mcba_usb: mcba_usb_read_bulk_callback(): fix URB memory leak
	can: usb_8dev: usb_8dev_read_bulk_callback(): fix URB memory leak
	migrate: correct lock ordering for hugetlb file folios
	bpf: Do not let BPF test infra emit invalid GSO types to stack
	bpf: Reject narrower access to pointer ctx fields
	fbdev: fbcon: Properly revert changes when vc_resize() failed
	fbdev: fbcon: release buffer when fbcon_do_set_font() failed
	fbcon: always restore the old font data in fbcon_do_set_font()
	Bluetooth: hci_uart: fix null-ptr-deref in hci_uart_write_work
	net/mlx5: Fix memory leak in esw_acl_ingress_lgcy_setup()
	net: mvpp2: cls: Fix memory leak in mvpp2_ethtool_cls_rule_ins()
	rocker: fix memory leak in rocker_world_port_post_fini()
	nfc: llcp: Fix memleak in nfc_llcp_send_ui_frame().
	ice: stop counting UDP csum mismatch as rx_errors
	net/mlx5: Add HW definitions of vport debug counters
	net/mlx5e: Expose rx_oversize_pkts_buffer counter
	net/mlx5e: Report rx_discards_phy via rx_dropped
	net/mlx5e: Account for netdev stats in ndo_get_stats64
	nfc: nci: Fix race between rfkill and nci_unregister_device().
	net: bridge: fix static key check
	scsi: firewire: sbp-target: Fix overflow in sbp_make_tpg()
	dma/pool: distinguish between missing and exhausted atomic pools
	scsi: be2iscsi: Fix a memory leak in beiscsi_boot_get_sinfo()
	net/sched: act_ife: convert comma to semicolon
	nvme-fc: rename free_ctrl callback to match name pattern
	nvme-pci: do not directly handle subsys reset fallout
	nvme: fix PCIe subsystem reset controller state transition
	xfs: set max_agbno to allow sparse alloc of last full inode chunk
	dmaengine: stm32: dmamux: fix OF node leak on route allocation failure
	dmaengine: stm32: dmamux: fix device leak on route allocation
	scsi: xen: scsiback: Fix potential memory leak in scsiback_remove()
	w1: w1_therm: use swap() to make code cleaner
	w1: therm: Fix off-by-one buffer overflow in alarms_store
	iio: adc: exynos_adc: fix OF populate on driver rebind
	mei: trace: treat reg parameter as string
	driver core: fix potential null-ptr-deref in device_add()
	mm/pagewalk: add walk_page_range_vma()
	ksm: use range-walk function to jump over holes in scan_get_next_rmap_item
	drm/amdkfd: fix a memory leak in device_queue_manager_init()
	comedi: Fix getting range information for subdevices 16 to 255
	can: esd_usb: esd_usb_read_bulk_callback(): fix URB memory leak
	of: platform: Use default match table for /firmware
	ipv6: sr: Fix MAC comparison to be constant-time
	netfilter: nf_tables: typo NULL check in _clone() function
	Revert "selftests: Replace sleep with slowwait"
	writeback: fix 100% CPU usage when dirtytime_expire_interval is 0
	pinctrl: meson: mark the GPIO controller as sleeping
	HID: uclogic: Correct devm device reference for hidinput input_dev name
	HID: uclogic: Add NULL check in uclogic_input_configured()
	drm/imx: imx-tve: use local encoder and connector variables
	drm/imx: imx-tve: move initialization into probe
	drm/imx/tve: fix probe device leak
	Linux 5.10.249

Change-Id: I3ba7e7479927a8d6194d12982a33e90a8ec542a4
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
tree: 981d21f0903f6e16b8382345cbc89f6cd2884a5b
  1. android/
  2. arch/
  3. block/
  4. certs/
  5. crypto/
  6. Documentation/
  7. drivers/
  8. fs/
  9. include/
  10. init/
  11. io_uring/
  12. ipc/
  13. kernel/
  14. lib/
  15. LICENSES/
  16. mm/
  17. net/
  18. samples/
  19. scripts/
  20. security/
  21. sound/
  22. tools/
  23. usr/
  24. virt/
  25. .clang-format
  26. .cocciconfig
  27. .get_maintainer.ignore
  28. .gitattributes
  29. .gitignore
  30. .mailmap
  31. BUILD.bazel
  32. build.config.aarch64
  33. build.config.allmodconfig
  34. build.config.allmodconfig.aarch64
  35. build.config.allmodconfig.arm
  36. build.config.allmodconfig.x86_64
  37. build.config.amlogic
  38. build.config.arm
  39. build.config.common
  40. build.config.constants
  41. build.config.db845c
  42. build.config.gki
  43. build.config.gki-debug.aarch64
  44. build.config.gki-debug.x86_64
  45. build.config.gki.aarch64
  46. build.config.gki.aarch64.fips140
  47. build.config.gki.x86_64
  48. build.config.gki_kasan
  49. build.config.gki_kasan.aarch64
  50. build.config.gki_kasan.x86_64
  51. build.config.gki_kprobes
  52. build.config.gki_kprobes.aarch64
  53. build.config.gki_kprobes.x86_64
  54. build.config.hikey960
  55. build.config.khwasan
  56. build.config.rockchip
  57. build.config.rockpi4
  58. build.config.x86_64
  59. COPYING
  60. CREDITS
  61. Kbuild
  62. Kconfig
  63. MAINTAINERS
  64. Makefile
  65. OWNERS
  66. README
  67. README.md
README.md

How do I submit patches to Android Common Kernels

  1. BEST: Make all of your changes to upstream Linux. If appropriate, backport to the stable releases. These patches will be merged automatically in the corresponding common kernels. If the patch is already in upstream Linux, post a backport of the patch that conforms to the patch requirements below.

    • Do not send patches upstream that contain only symbol exports. To be considered for upstream Linux, additions of EXPORT_SYMBOL_GPL() require an in-tree modular driver that uses the symbol -- so include the new driver or changes to an existing driver in the same patchset as the export.
    • When sending patches upstream, the commit message must contain a clear case for why the patch is needed and beneficial to the community. Enabling out-of-tree drivers or functionality is not not a persuasive case.

  2. LESS GOOD: Develop your patches out-of-tree (from an upstream Linux point-of-view). Unless these are fixing an Android-specific bug, these are very unlikely to be accepted unless they have been coordinated with kernel-team@android.com. If you want to proceed, post a patch that conforms to the patch requirements below.

Common Kernel patch requirements

  • All patches must conform to the Linux kernel coding standards and pass script/checkpatch.pl
  • Patches shall not break gki_defconfig or allmodconfig builds for arm, arm64, x86, x86_64 architectures (see https://source.android.com/setup/build/building-kernels)
  • If the patch is not merged from an upstream branch, the subject must be tagged with the type of patch: UPSTREAM:, BACKPORT:, FROMGIT:, FROMLIST:, or ANDROID:.
  • All patches must have a Change-Id: tag (see https://gerrit-review.googlesource.com/Documentation/user-changeid.html)
  • If an Android bug has been assigned, there must be a Bug: tag.
  • All patches must have a Signed-off-by: tag by the author and the submitter

Additional requirements are listed below based on patch type

Requirements for backports from mainline Linux: UPSTREAM:, BACKPORT:

  • If the patch is a cherry-pick from Linux mainline with no changes at all
    • tag the patch subject with UPSTREAM:.
    • add upstream commit information with a (cherry picked from commit ...) line
    • Example:
      • if the upstream commit message is
        important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <fred.jones@foo.org>
  • then Joe Smith would upload the patch for the common kernel as
        UPSTREAM: important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <fred.jones@foo.org>

        Bug: 135791357
        Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
        (cherry picked from commit c31e73121f4c1ec41143423ac6ce3ce6dafdcec1)
        Signed-off-by: Joe Smith <joe.smith@foo.org>
  • If the patch requires any changes from the upstream version, tag the patch with BACKPORT: instead of UPSTREAM:.
    • use the same tags as UPSTREAM:
    • add comments about the changes under the (cherry picked from commit ...) line
    • Example:
        BACKPORT: important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <fred.jones@foo.org>

        Bug: 135791357
        Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
        (cherry picked from commit c31e73121f4c1ec41143423ac6ce3ce6dafdcec1)
        [joe: Resolved minor conflict in drivers/foo/bar.c ]
        Signed-off-by: Joe Smith <joe.smith@foo.org>

Requirements for other backports: FROMGIT:, FROMLIST:,

  • If the patch has been merged into an upstream maintainer tree, but has not yet been merged into Linux mainline
    • tag the patch subject with FROMGIT:
    • add info on where the patch came from as (cherry picked from commit <sha1> <repo> <branch>). This must be a stable maintainer branch (not rebased, so don't use linux-next for example).
    • if changes were required, use BACKPORT: FROMGIT:
    • Example:
      • if the commit message in the maintainer tree is
        important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <fred.jones@foo.org>
  • then Joe Smith would upload the patch for the common kernel as
        FROMGIT: important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <fred.jones@foo.org>

        Bug: 135791357
        (cherry picked from commit 878a2fd9de10b03d11d2f622250285c7e63deace
         https://git.kernel.org/pub/scm/linux/kernel/git/foo/bar.git test-branch)
        Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
        Signed-off-by: Joe Smith <joe.smith@foo.org>
  • If the patch has been submitted to LKML, but not accepted into any maintainer tree
    • tag the patch subject with FROMLIST:
    • add a Link: tag with a link to the submittal on lore.kernel.org
    • add a Bug: tag with the Android bug (required for patches not accepted into a maintainer tree)
    • if changes were required, use BACKPORT: FROMLIST:
    • Example:
        FROMLIST: important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <fred.jones@foo.org>

        Bug: 135791357
        Link: https://lore.kernel.org/lkml/20190619171517.GA17557@someone.com/
        Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
        Signed-off-by: Joe Smith <joe.smith@foo.org>

Requirements for Android-specific patches: ANDROID:

  • If the patch is fixing a bug to Android-specific code
    • tag the patch subject with ANDROID:
    • add a Fixes: tag that cites the patch with the bug
    • Example:
        ANDROID: fix android-specific bug in foobar.c

        This is the detailed description of the important fix

        Fixes: 1234abcd2468 ("foobar: add cool feature")
        Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
        Signed-off-by: Joe Smith <joe.smith@foo.org>
  • If the patch is a new feature
    • tag the patch subject with ANDROID:
    • add a Bug: tag with the Android bug (required for android-specific features)