Google Git
Sign in
android / kernel / common / ea2937bdd12f6ebc51e6698c5696a1b16507999b
commitea2937bdd12f6ebc51e6698c5696a1b16507999b[log] [tgz]
authorGreg Kroah-Hartman <gregkh@google.com>Tue Jan 02 12:20:35 2024 +0000
committerGreg Kroah-Hartman <gregkh@google.com>Tue Jan 09 16:11:37 2024 +0000
tree78273318ac3efad0a8dc5c13670ddda4f8c5f02b
parent174bf0555d8ed9f8c28cce5716b856828529900f [diff]
parentd93fa2c78854d25ed4b67ac87f1c3c264d8b27fb [diff]
Merge 5.15.145 into android13-5.15-lts

Changes in 5.15.145
	ksmbd: use ksmbd_req_buf_next() in ksmbd_verify_smb_message()
	ksmdb: use cmd helper variable in smb2_get_ksmbd_tcon()
	ksmbd: Remove redundant 'flush_workqueue()' calls
	ksmbd: remove md4 leftovers
	ksmbd: remove smb2_buf_length in smb2_hdr
	ksmbd: remove smb2_buf_length in smb2_transform_hdr
	ksmbd: change LeaseKey data type to u8 array
	ksmbd: use oid registry functions to decode OIDs
	ksmbd: Remove unused parameter from smb2_get_name()
	ksmbd: Remove unused fields from ksmbd_file struct definition
	ksmbd: set both ipv4 and ipv6 in FSCTL_QUERY_NETWORK_INTERFACE_INFO
	ksmbd: Fix buffer_check_err() kernel-doc comment
	ksmbd: Fix smb2_set_info_file() kernel-doc comment
	ksmbd: Delete an invalid argument description in smb2_populate_readdir_entry()
	ksmbd: Fix smb2_get_name() kernel-doc comment
	ksmbd: register ksmbd ib client with ib_register_client()
	ksmbd: set 445 port to smbdirect port by default
	ksmbd: smbd: call rdma_accept() under CM handler
	ksmbd: smbd: create MR pool
	ksmbd: smbd: change the default maximum read/write, receive size
	ksmbd: add smb-direct shutdown
	ksmbd: smbd: fix missing client's memory region invalidation
	ksmbd: smbd: validate buffer descriptor structures
	ksmbd: add support for key exchange
	ksmbd: use netif_is_bridge_port
	ksmbd: store fids as opaque u64 integers
	ksmbd: shorten experimental warning on loading the module
	ksmbd: Remove a redundant zeroing of memory
	ksmbd: replace usage of found with dedicated list iterator variable
	smb3: fix ksmbd bigendian bug in oplock break, and move its struct to smbfs_common
	ksmbd: remove filename in ksmbd_file
	ksmbd: validate length in smb2_write()
	ksmbd: smbd: change prototypes of RDMA read/write related functions
	ksmbd: smbd: introduce read/write credits for RDMA read/write
	ksmbd: smbd: simplify tracking pending packets
	ksmbd: smbd: change the return value of get_sg_list
	ksmbd: smbd: handle multiple Buffer descriptors
	ksmbd: fix wrong smbd max read/write size check
	ksmbd: Fix some kernel-doc comments
	ksmbd: smbd: fix connection dropped issue
	ksmbd: smbd: relax the count of sges required
	ksmbd: smbd: Remove useless license text when SPDX-License-Identifier is already used
	ksmbd: remove duplicate flag set in smb2_write
	ksmbd: remove unused ksmbd_share_configs_cleanup function
	ksmbd: use wait_event instead of schedule_timeout()
	ksmbd: request update to stale share config
	ksmbd: remove unnecessary generic_fillattr in smb2_open
	ksmbd: don't open-code file_path()
	ksmbd: don't open-code %pD
	ksmbd: constify struct path
	ksmbd: remove generic_fillattr use in smb2_open()
	ksmbd: casefold utf-8 share names and fix ascii lowercase conversion
	ksmbd: change security id to the one samba used for posix extension
	ksmbd: set file permission mode to match Samba server posix extension behavior
	ksmbd: fill sids in SMB_FIND_FILE_POSIX_INFO response
	ksmbd: fix encryption failure issue for session logoff response
	ksmbd: set NTLMSSP_NEGOTIATE_SEAL flag to challenge blob
	ksmbd: decrease the number of SMB3 smbdirect server SGEs
	ksmbd: reduce server smbdirect max send/receive segment sizes
	ksmbd: hide socket error message when ipv6 config is disable
	ksmbd: make utf-8 file name comparison work in __caseless_lookup()
	ksmbd: call ib_drain_qp when disconnected
	ksmbd: validate share name from share config response
	ksmbd: replace one-element arrays with flexible-array members
	ksmbd: set SMB2_SESSION_FLAG_ENCRYPT_DATA when enforcing data encryption for this share
	ksmbd: use F_SETLK when unlocking a file
	ksmbd: Fix resource leak in smb2_lock()
	ksmbd: Convert to use sysfs_emit()/sysfs_emit_at() APIs
	ksmbd: send proper error response in smb2_tree_connect()
	ksmbd: Implements sess->ksmbd_chann_list as xarray
	ksmbd: Implements sess->rpc_handle_list as xarray
	ksmbd: fix typo, syncronous->synchronous
	ksmbd: Remove duplicated codes
	ksmbd: update Kconfig to note Kerberos support and fix indentation
	ksmbd: Fix spelling mistake "excceed" -> "exceeded"
	ksmbd: Fix parameter name and comment mismatch
	ksmbd: fix possible memory leak in smb2_lock()
	ksmbd: fix wrong signingkey creation when encryption is AES256
	ksmbd: remove unused is_char_allowed function
	ksmbd: delete asynchronous work from list
	ksmbd: fix slab-out-of-bounds in init_smb2_rsp_hdr
	ksmbd: avoid out of bounds access in decode_preauth_ctxt()
	ksmbd: set NegotiateContextCount once instead of every inc
	ksmbd: avoid duplicate negotiate ctx offset increments
	ksmbd: remove unused compression negotiate ctx packing
	fs: introduce lock_rename_child() helper
	ksmbd: fix racy issue from using ->d_parent and ->d_name
	ksmbd: fix racy issue from session setup and logoff
	ksmbd: destroy expired sessions
	ksmbd: block asynchronous requests when making a delay on session setup
	ksmbd: fix racy issue from smb2 close and logoff with multichannel
	ksmbd: fix racy issue under cocurrent smb2 tree disconnect
	ksmbd: fix uninitialized pointer read in ksmbd_vfs_rename()
	ksmbd: fix uninitialized pointer read in smb2_create_link()
	ksmbd: fix multiple out-of-bounds read during context decoding
	ksmbd: fix UAF issue from opinfo->conn
	ksmbd: call putname after using the last component
	ksmbd: fix out-of-bound read in deassemble_neg_contexts()
	ksmbd: fix out-of-bound read in parse_lease_state()
	ksmbd: fix posix_acls and acls dereferencing possible ERR_PTR()
	ksmbd: check the validation of pdu_size in ksmbd_conn_handler_loop
	ksmbd: validate smb request protocol id
	ksmbd: add mnt_want_write to ksmbd vfs functions
	ksmbd: remove unused ksmbd_tree_conn_share function
	ksmbd: use kzalloc() instead of __GFP_ZERO
	ksmbd: return a literal instead of 'err' in ksmbd_vfs_kern_path_locked()
	ksmbd: Change the return value of ksmbd_vfs_query_maximal_access to void
	ksmbd: use kvzalloc instead of kvmalloc
	ksmbd: Replace the ternary conditional operator with min()
	ksmbd: fix out of bounds read in smb2_sess_setup
	ksmbd: add missing compound request handing in some commands
	ksmbd: Use struct_size() helper in ksmbd_negotiate_smb_dialect()
	ksmbd: Replace one-element array with flexible-array member
	ksmbd: Fix unsigned expression compared with zero
	ksmbd: check if a mount point is crossed during path lookup
	ksmbd: validate session id and tree id in compound request
	ksmbd: fix out of bounds in init_smb2_rsp_hdr()
	ksmbd: switch to use kmemdup_nul() helper
	ksmbd: add support for read compound
	ksmbd: fix wrong interim response on compound
	ksmbd: fix `force create mode' and `force directory mode'
	ksmbd: reduce descriptor size if remaining bytes is less than request size
	ksmbd: Fix one kernel-doc comment
	ksmbd: fix slub overflow in ksmbd_decode_ntlmssp_auth_blob()
	ksmbd: add missing calling smb2_set_err_rsp() on error
	ksmbd: remove experimental warning
	ksmbd: remove unneeded mark_inode_dirty in set_info_sec()
	ksmbd: fix passing freed memory 'aux_payload_buf'
	ksmbd: return invalid parameter error response if smb2 request is invalid
	ksmbd: check iov vector index in ksmbd_conn_write()
	ksmbd: fix race condition between session lookup and expire
	ksmbd: fix race condition with fp
	ksmbd: fix race condition from parallel smb2 logoff requests
	ksmbd: fix race condition from parallel smb2 lock requests
	ksmbd: fix race condition between tree conn lookup and disconnect
	ksmbd: fix wrong error response status by using set_smb2_rsp_status()
	ksmbd: fix Null pointer dereferences in ksmbd_update_fstate()
	ksmbd: fix potential double free on smb2_read_pipe() error path
	ksmbd: Remove unused field in ksmbd_user struct
	ksmbd: reorganize ksmbd_iov_pin_rsp()
	ksmbd: fix kernel-doc comment of ksmbd_vfs_setxattr()
	ksmbd: fix recursive locking in vfs helpers
	ksmbd: fix missing RDMA-capable flag for IPoIB device in ksmbd_rdma_capable_netdev()
	ksmbd: add support for surrogate pair conversion
	ksmbd: no need to wait for binded connection termination at logoff
	ksmbd: fix kernel-doc comment of ksmbd_vfs_kern_path_locked()
	ksmbd: handle malformed smb1 message
	ksmbd: prevent memory leak on error return
	ksmbd: fix possible deadlock in smb2_open
	ksmbd: separately allocate ci per dentry
	ksmbd: move oplock handling after unlock parent dir
	ksmbd: release interim response after sending status pending response
	ksmbd: move setting SMB2_FLAGS_ASYNC_COMMAND and AsyncId
	ksmbd: don't update ->op_state as OPLOCK_STATE_NONE on error
	Revert "drm/bridge: lt9611uxc: fix the race in the error path"
	Revert "drm/bridge: lt9611uxc: Register and attach our DSI device at probe"
	Revert "drm/bridge: lt9611uxc: Switch to devm MIPI-DSI helpers"
	tracing/kprobes: Return EADDRNOTAVAIL when func matches several symbols
	kasan: disable kasan_non_canonical_hook() for HW tags
	Linux 5.15.145

Change-Id: I0676f5e30b5f4e1da65c734a434996f878ff7ed3
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
tree: 78273318ac3efad0a8dc5c13670ddda4f8c5f02b
  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.gce.x86_64
  43. build.config.gki
  44. build.config.gki-debug.aarch64
  45. build.config.gki-debug.x86_64
  46. build.config.gki.aarch64
  47. build.config.gki.aarch64.fips140
  48. build.config.gki.x86_64
  49. build.config.gki_kasan
  50. build.config.gki_kasan.aarch64
  51. build.config.gki_kasan.x86_64
  52. build.config.gki_kprobes
  53. build.config.gki_kprobes.aarch64
  54. build.config.gki_kprobes.x86_64
  55. build.config.khwasan
  56. build.config.rockpi4
  57. build.config.x86_64
  58. COPYING
  59. CREDITS
  60. Kbuild
  61. Kconfig
  62. Kconfig.ext
  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 scripts/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)