Skip to content

build(deps): bump urllib3 from 2.0.7 to 2.2.2 in /drivers/gpu/drm/ci/xfails #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
wants to merge 10,000 commits into
base: develop
Choose a base branch
from
Open

build(deps): bump urllib3 from 2.0.7 to 2.2.2 in /drivers/gpu/drm/ci/xfails #60

wants to merge 10,000 commits into from

Conversation

dependabot[bot]
Copy link

@dependabot dependabot bot commented on behalf of github May 12, 2025 •
edited
Loading

Bumps urllib3 from 2.0.7 to 2.2.2.

Release notes

Sourced from urllib3's releases.

2.2.2

🚀 urllib3 is fundraising for HTTP/2 support

urllib3 is raising ~$40,000 USD to release HTTP/2 support and ensure long-term sustainable maintenance of the project after a sharp decline in financial support for 2023. If your company or organization uses Python and would benefit from HTTP/2 support in Requests, pip, cloud SDKs, and thousands of other projects please consider contributing financially to ensure HTTP/2 support is developed sustainably and maintained for the long-haul.

Thank you for your support.

Changes

  • Added the Proxy-Authorization header to the list of headers to strip from requests when redirecting to a different host. As before, different headers can be set via Retry.remove_headers_on_redirect.
  • Allowed passing negative integers as amt to read methods of http.client.HTTPResponse as an alternative to None. (#3122)
  • Fixed return types representing copying actions to use typing.Self. (#3363)

Full Changelog: urllib3/urllib3@2.2.1...2.2.2

2.2.1

🚀 urllib3 is fundraising for HTTP/2 support

urllib3 is raising ~$40,000 USD to release HTTP/2 support and ensure long-term sustainable maintenance of the project after a sharp decline in financial support for 2023. If your company or organization uses Python and would benefit from HTTP/2 support in Requests, pip, cloud SDKs, and thousands of other projects please consider contributing financially to ensure HTTP/2 support is developed sustainably and maintained for the long-haul.

Thank you for your support.

Changes

  • Fixed issue where InsecureRequestWarning was emitted for HTTPS connections when using Emscripten. (#3331)
  • Fixed HTTPConnectionPool.urlopen to stop automatically casting non-proxy headers to HTTPHeaderDict. This change was premature as it did not apply to proxy headers and HTTPHeaderDict does not handle byte header values correctly yet. (#3343)
  • Changed ProtocolError to InvalidChunkLength when response terminates before the chunk length is sent. (#2860)
  • Changed ProtocolError to be more verbose on incomplete reads with excess content. (#3261)

2.2.0

🖥️ urllib3 now works in the browser

🎉 This release adds experimental support for using urllib3 in the browser with Pyodide! 🎉

Thanks to Joe Marshall (@​joemarshall) for contributing this feature. This change was possible thanks to work done in urllib3 v2.0 to detach our API from http.client. Please report all bugs to the urllib3 issue tracker.

🚀 urllib3 is fundraising for HTTP/2 support

urllib3 is raising ~$40,000 USD to release HTTP/2 support and ensure long-term sustainable maintenance of the project after a sharp decline in financial support for 2023. If your company or organization uses Python and would benefit from HTTP/2 support in Requests, pip, cloud SDKs, and thousands of other projects please consider contributing financially to ensure HTTP/2 support is developed sustainably and maintained for the long-haul.

Thank you for your support.

Changes

  • Added support for Emscripten and Pyodide, including streaming support in cross-origin isolated browser environments where threading is enabled. (#2951)
  • Added support for HTTPResponse.read1() method. (#3186)
  • Added rudimentary support for HTTP/2. (#3284)
  • Fixed issue where requests against urls with trailing dots were failing due to SSL errors when using proxy. (#2244)
  • Fixed HTTPConnection.proxy_is_verified and HTTPSConnection.proxy_is_verified to be always set to a boolean after connecting to a proxy. It could be None in some cases previously. (#3130)

... (truncated)

Changelog

Sourced from urllib3's changelog.

2.2.2 (2024-06-17)

  • Added the Proxy-Authorization header to the list of headers to strip from requests when redirecting to a different host. As before, different headers can be set via Retry.remove_headers_on_redirect.
  • Allowed passing negative integers as amt to read methods of http.client.HTTPResponse as an alternative to None. ([#3122](https://github.com/urllib3/urllib3/issues/3122) <https://github.com/urllib3/urllib3/issues/3122>__)
  • Fixed return types representing copying actions to use typing.Self. ([#3363](https://github.com/urllib3/urllib3/issues/3363) <https://github.com/urllib3/urllib3/issues/3363>__)

2.2.1 (2024-02-16)

  • Fixed issue where InsecureRequestWarning was emitted for HTTPS connections when using Emscripten. ([#3331](https://github.com/urllib3/urllib3/issues/3331) <https://github.com/urllib3/urllib3/issues/3331>__)
  • Fixed HTTPConnectionPool.urlopen to stop automatically casting non-proxy headers to HTTPHeaderDict. This change was premature as it did not apply to proxy headers and HTTPHeaderDict does not handle byte header values correctly yet. ([#3343](https://github.com/urllib3/urllib3/issues/3343) <https://github.com/urllib3/urllib3/issues/3343>__)
  • Changed InvalidChunkLength to ProtocolError when response terminates before the chunk length is sent. ([#2860](https://github.com/urllib3/urllib3/issues/2860) <https://github.com/urllib3/urllib3/issues/2860>__)
  • Changed ProtocolError to be more verbose on incomplete reads with excess content. ([#3261](https://github.com/urllib3/urllib3/issues/3261) <https://github.com/urllib3/urllib3/issues/3261>__)

2.2.0 (2024-01-30)

  • Added support for Emscripten and Pyodide <https://urllib3.readthedocs.io/en/latest/reference/contrib/emscripten.html>, including streaming support in cross-origin isolated browser environments where threading is enabled. ([#2951](https://github.com/urllib3/urllib3/issues/2951) <https://github.com/urllib3/urllib3/issues/2951>)
  • Added support for HTTPResponse.read1() method. ([#3186](https://github.com/urllib3/urllib3/issues/3186) <https://github.com/urllib3/urllib3/issues/3186>__)
  • Added rudimentary support for HTTP/2. ([#3284](https://github.com/urllib3/urllib3/issues/3284) <https://github.com/urllib3/urllib3/issues/3284>__)
  • Fixed issue where requests against urls with trailing dots were failing due to SSL errors when using proxy. ([#2244](https://github.com/urllib3/urllib3/issues/2244) <https://github.com/urllib3/urllib3/issues/2244>__)
  • Fixed HTTPConnection.proxy_is_verified and HTTPSConnection.proxy_is_verified to be always set to a boolean after connecting to a proxy. It could be None in some cases previously. ([#3130](https://github.com/urllib3/urllib3/issues/3130) <https://github.com/urllib3/urllib3/issues/3130>__)
  • Fixed an issue where headers passed in a request with json= would be mutated ([#3203](https://github.com/urllib3/urllib3/issues/3203) <https://github.com/urllib3/urllib3/issues/3203>__)
  • Fixed HTTPSConnection.is_verified to be set to False when connecting from a HTTPS proxy to an HTTP target. It was set to True previously. ([#3267](https://github.com/urllib3/urllib3/issues/3267) <https://github.com/urllib3/urllib3/issues/3267>__)
  • Fixed handling of new error message from OpenSSL 3.2.0 when configuring an HTTP proxy as HTTPS ([#3268](https://github.com/urllib3/urllib3/issues/3268) <https://github.com/urllib3/urllib3/issues/3268>__)
  • Fixed TLS 1.3 post-handshake auth when the server certificate validation is disabled ([#3325](https://github.com/urllib3/urllib3/issues/3325) <https://github.com/urllib3/urllib3/issues/3325>__)
  • Note for downstream distributors: To run integration tests, you now need to run the tests a second time with the --integration pytest flag. ([#3181](https://github.com/urllib3/urllib3/issues/3181) <https://github.com/urllib3/urllib3/issues/3181>__)

2.1.0 (2023-11-13)

  • Removed support for the deprecated urllib3[secure] extra. ([#2680](https://github.com/urllib3/urllib3/issues/2680) <https://github.com/urllib3/urllib3/issues/2680>__)
  • Removed support for the deprecated SecureTransport TLS implementation. ([#2681](https://github.com/urllib3/urllib3/issues/2681) <https://github.com/urllib3/urllib3/issues/2681>__)
  • Removed support for the end-of-life Python 3.7. ([#3143](https://github.com/urllib3/urllib3/issues/3143) <https://github.com/urllib3/urllib3/issues/3143>__)
  • Allowed loading CA certificates from memory for proxies. ([#3065](https://github.com/urllib3/urllib3/issues/3065) <https://github.com/urllib3/urllib3/issues/3065>__)
  • Fixed decoding Gzip-encoded responses which specified x-gzip content-encoding. ([#3174](https://github.com/urllib3/urllib3/issues/3174) <https://github.com/urllib3/urllib3/issues/3174>__)
Commits

Dependabot compatibility score

You can trigger a rebase of this PR by commenting @dependabot rebase.

Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
    You can disable automated security fix PRs for this repo from the Security Alerts page.

Note
Automatic rebases have been disabled on this pull request as it has been open for over 30 days.

Andrea Righi and others added 30 commits April 15, 2025 11:23
@mrphilcox
UBUNTU: [Config] aws: disable Rust support
0681112 
BugLink: https://bugs.launchpad.net/bugs/2015867

Signed-off-by: Andrea Righi <[email protected]>
@mrphilcox
UBUNTU: Start new release
fcbf216 
Ignore: yes
Signed-off-by: Andrea Righi <[email protected]>
@mrphilcox
UBUNTU: link-to-tracker: update tracking bug
ebd25df 
BugLink: https://bugs.launchpad.net/bugs/2016251
Properties: no-test-build
Signed-off-by: Andrea Righi <[email protected]>
@mrphilcox
UBUNTU: Ubuntu-aws-6.2.0-1004.4
31893ba 
Signed-off-by: Andrea Righi <[email protected]>
@rtg-canonical @mrphilcox
UBUNTU: Move sev-guest to linux-modules
e402455 
BugLink: https://bugs.launchpad.net/bugs/2018303

Signed-off-by: Tim Gardner <[email protected]>
Acked-by: John Cabaj <[email protected]>
Acked-by: Cengiz Can <[email protected]>
Signed-off-by: Tim Gardner <[email protected]>
@mrphilcox
UBUNTU: [Packaging] update.conf: switch to mantic/linux-unstable
9f74f22 
Ignore: yes
Signed-off-by: Andrea Righi <[email protected]>
@mrphilcox
UBUNTU: [Packaging] move to mantic with linux 6.5
d5321ba 
Ignore: yes
Signed-off-by: Andrea Righi <[email protected]>
@mrphilcox
UBUNTU: [Config] update annotations after rebase to 6.5
1a0e7c7 
Signed-off-by: Andrea Righi <[email protected]>
@mrphilcox
UBUNTU: [Packaging] aws: ZSTD compress module
46ec9dd 
Add zstd to the build dependencies to support compressed zstd modules.

BugLink: https://bugs.launchpad.net/bugs/2028568
Signed-off-by: Andrea Righi <[email protected]>
@mrphilcox
UBUNTU: [Packaging] aws: add libstdc++-dev to the build dependencies
c0390f6 
perf now requires libstdc++-dev to build.

Signed-off-by: Andrea Righi <[email protected]>
@mrphilcox
UBUNTU: Start new release
088880e 
Ignore: yes
Signed-off-by: Andrea Righi <[email protected]>
@mrphilcox
UBUNTU: link-to-tracker: update tracking bug
ed5c7a4 
BugLink: https://bugs.launchpad.net/bugs/2029220
Properties: no-test-build
Signed-off-by: Andrea Righi <[email protected]>
@mrphilcox
UBUNTU: Ubuntu-aws-6.5.0-1001.1
fc4a8b9 
Signed-off-by: Andrea Righi <[email protected]>
@mrphilcox
UBUNTU: [Packaging] aws: add python3-dev to build-depends
4d96bb7 
python3-dev is now required by the regular kernel build process, add it
to build-depends.

Signed-off-by: Andrea Righi <[email protected]>
@mrphilcox
UBUNTU: Start new release
3d595c4 
Ignore: yes
Signed-off-by: Andrea Righi <[email protected]>
@mrphilcox
UBUNTU: link-to-tracker: update tracking bug
de4b35f 
BugLink: https://bugs.launchpad.net/bugs/2029364
Properties: no-test-build
Signed-off-by: Andrea Righi <[email protected]>
@mrphilcox
UBUNTU: Ubuntu-aws-6.5.0-1002.2
014d6ba 
Signed-off-by: Andrea Righi <[email protected]>
@mrphilcox
UBUNTU: [Packaging] update update.conf
28eb61d 
BugLink: https://bugs.launchpad.net/bugs/1786013
Signed-off-by: Andrea Righi <[email protected]>
@mrphilcox
UBUNTU: Start new release
31c92c1 
Ignore: yes
Signed-off-by: Andrea Righi <[email protected]>
@mrphilcox
UBUNTU: link-to-tracker: update tracking bug
93b9f1a 
BugLink: https://bugs.launchpad.net/bugs/2033021
Properties: no-test-build
Signed-off-by: Andrea Righi <[email protected]>
@mrphilcox
UBUNTU: [Config] aws: update toolchain versions in annotations
b29c410 
Signed-off-by: Andrea Righi <[email protected]>
@mrphilcox
UBUNTU: Ubuntu-aws-6.5.0-1003.3
591569a 
Signed-off-by: Andrea Righi <[email protected]>
@mrphilcox
UBUNTU: Start new release
9af998e 
Ignore: yes
Signed-off-by: Andrea Righi <[email protected]>
@mrphilcox
UBUNTU: link-to-tracker: update tracking bug
beb2555 
BugLink: https://bugs.launchpad.net/bugs/2034043
Properties: no-test-build
Signed-off-by: Andrea Righi <[email protected]>
@mrphilcox
UBUNTU: Ubuntu-aws-6.5.0-1004.4
2cc671e 
Signed-off-by: Andrea Righi <[email protected]>
@mrphilcox
UBUNTU: Start new release
30ab014 
Ignore: yes
Signed-off-by: Andrea Righi <[email protected]>
@mrphilcox
UBUNTU: link-to-tracker: update tracking bug
aed8f99 
BugLink: https://bugs.launchpad.net/bugs/2034547
Properties: no-test-build
Signed-off-by: Andrea Righi <[email protected]>
@mrphilcox
UBUNTU: Ubuntu-aws-6.5.0-1005.5
48620f6 
Signed-off-by: Andrea Righi <[email protected]>
@piso77 @mrphilcox
UBUNTU: Start new release
4ccfa65 
Ignore: yes
Signed-off-by: Paolo Pisati <[email protected]>
@piso77 @mrphilcox
UBUNTU: link-to-tracker: update tracking bug
b4337a1 
BugLink: https://bugs.launchpad.net/bugs/2035596
Properties: no-test-build
Signed-off-by: Paolo Pisati <[email protected]>
nicolinc and others added 18 commits April 15, 2025 11:23
@nicolinc @mrphilcox
iommu/tegra241-cmdqv: Fix alignment failure at max_n_shift
dbf5560 
BugLink: https://bugs.launchpad.net/bugs/2101185

When configuring a kernel with PAGE_SIZE=4KB, depending on its setting of
CONFIG_CMA_ALIGNMENT, VCMDQ_LOG2SIZE_MAX=19 could fail the alignment test
and trigger a WARN_ON:
    WARNING: at drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c:3646
    Call trace:
     arm_smmu_init_one_queue+0x15c/0x210
     tegra241_cmdqv_init_structures+0x114/0x338
     arm_smmu_device_probe+0xb48/0x1d90

Fix it by capping max_n_shift to CMDQ_MAX_SZ_SHIFT as SMMUv3 CMDQ does.

Fixes: 918eb5c ("iommu/arm-smmu-v3: Add in-kernel support for NVIDIA Tegra241 (Grace) CMDQV")
Signed-off-by: Nicolin Chen <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Will Deacon <[email protected]>
(cherry picked from commit a379971)
Signed-off-by: Magali Lemes <[email protected]>
Acked-by: Philip Cox <[email protected]>
Acked-by: Massimiliano Pellizzer <[email protected]>
Signed-off-by: Magali Lemes <[email protected]>
@lclaudio @mrphilcox
iommu/tegra241-cmdqv: do not use smp_processor_id in preemptible context
dfc1ee3 
BugLink: https://bugs.launchpad.net/bugs/2101185

During boot some of the calls to tegra241_cmdqv_get_cmdq() will happen
in preemptible context. As this function calls smp_processor_id(), if
CONFIG_DEBUG_PREEMPT is enabled, these calls will trigger a series of
"BUG: using smp_processor_id() in preemptible" backtraces.

As tegra241_cmdqv_get_cmdq() only calls smp_processor_id() to use the
CPU number as a factor to balance out traffic on cmdq usage, it is safe
to use raw_smp_processor_id() here.

Cc: <[email protected]>
Fixes: 918eb5c ("iommu/arm-smmu-v3: Add in-kernel support for NVIDIA Tegra241 (Grace) CMDQV")
Signed-off-by: Luis Claudio R. Goncalves <[email protected]>
Reviewed-by: Jason Gunthorpe <[email protected]>
Reviewed-by: Nicolin Chen <[email protected]>
Tested-by: Nicolin Chen <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Will Deacon <[email protected]>
(cherry picked from commit 1f80621)
Signed-off-by: Magali Lemes <[email protected]>
Acked-by: Philip Cox <[email protected]>
Acked-by: Massimiliano Pellizzer <[email protected]>
Signed-off-by: Magali Lemes <[email protected]>
@nicolinc @mrphilcox
iommu/tegra241-cmdqv: Read SMMU IDR1.CMDQS instead of hardcoding
1f7be3d 
BugLink: https://bugs.launchpad.net/bugs/2101185

The hardware limitation "max=19" actually comes from SMMU Command Queue.
So, it'd be more natural for tegra241-cmdqv driver to read it out rather
than hardcoding it itself.

This is not an issue yet for a kernel on a baremetal system, but a guest
kernel setting the queue base/size in form of IPA/gPA might result in a
noncontiguous queue in the physical address space, if underlying physical
pages backing up the guest RAM aren't contiguous entirely: e.g. 2MB-page
backed guest RAM cannot guarantee a contiguous queue if it is 8MB (capped
to VCMDQ_LOG2SIZE_MAX=19). This might lead to command errors when HW does
linear-read from a noncontiguous queue memory.

Adding this extra IDR1.CMDQS cap (in the guest kernel) allows VMM to set
SMMU's IDR1.CMDQS=17 for the case mentioned above, so a guest-level queue
will be capped to maximum 2MB, ensuring a contiguous queue memory.

Fixes: a379971 ("iommu/tegra241-cmdqv: Fix alignment failure at max_n_shift")
Reported-by: Ian Kalinowski <[email protected]>
Cc: [email protected]
Signed-off-by: Nicolin Chen <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Will Deacon <[email protected]>
(cherry picked from commit e94dc6d)
Signed-off-by: Magali Lemes <[email protected]>
Acked-by: Philip Cox <[email protected]>
Acked-by: Massimiliano Pellizzer <[email protected]>
Signed-off-by: Magali Lemes <[email protected]>
@mrphilcox
UBUNTU: Start new release
87f3efe 
Ignore: yes
Signed-off-by: Philip Cox <[email protected]>
@mrphilcox
UBUNTU: [Packaging]: wdat_wdt.ko is moved from "linux-modules-extra-*…
2e843ec 
…-generic" to "linux-modules-*-generic"

BugLink: https://bugs.launchpad.net/bugs/2098554

Linux supports the virtual watchdog timer through the "wdat_wdt" module.
In Ubuntu 24.04 LTS on amd64, this module is in the
"linux-modules-extra-*-generic" series of packages. These are depended on by
the "linux-image-generic" package, but not by the "linux-image-virtual"
package. The latter is what is included in Ubuntu Official Cloud Images.

Installing "linux-image-virtual" on amd64 should get the "wdat_wdt" module
because it's necessary to fully support a common hypervisor. And to be
consistent, we should do the same for other architectures too.

Signed-off-by: Mehmet Basaran<[email protected]>
Acked-by: Stefan Bader <[email protected]>
Acked-by: Agathe Porte <[email protected]>
Signed-off-by: Stefan Bader <[email protected]>
(copied from master)
Signed-off-by: Philip Cox <[email protected]>
@mrphilcox
UBUNTU: link-to-tracker: update tracking bug
0da4008 
BugLink: https://bugs.launchpad.net/bugs/2102494
Properties: no-test-build
Signed-off-by: Philip Cox <[email protected]>
@mrphilcox
UBUNTU: Ubuntu-aws-6.8.0-1027.29
e8bce3d 
Signed-off-by: Philip Cox <[email protected]>
@mrphilcox
UBUNTU: Start new release
11c5a47 
Ignore: yes
Signed-off-by: Philip Cox <[email protected]>
@mrphilcox
UBUNTU: link-to-tracker: update tracking bug
0bb940a 
BugLink: https://bugs.launchpad.net/bugs/2107043
Properties: no-test-build
Signed-off-by: Philip Cox <[email protected]>
@mrphilcox
UBUNTU: Ubuntu-aws-6.8.0-1028.30
b0e23ce 
Signed-off-by: Philip Cox <[email protected]>
@jwk404
@@DELPHIX_PATCHSET_START@@
8bd456b 
This is a placeholder commit to separate the Ubuntu kernel source and
our patches. Used by kernel_merge_with_upstream() in the linux-pkg repo.
@pzakha
DLPX-71852 iSCSI: journal flooded with "Unable to locate Target IQN" …
79ae44d 
…messages (#2)
@pzakha
DLPX-72065 Aborted iSCSI command never completes after LUN reset (#4)
806187c
@pcd1193182
DLPX-83697 iscsi target login should wait until tx/rx threads have pr…
30c0a7e 
…operly started (#14)
DLPX-83701 Make function mnt_add_count() traceable (#16)
286a880
@palash-gandhi
Extract PKG_ABI from mutated string
4309eee
@sebroy
Reintroduce fix from DLPX-87344 to build only with amd64 annotations
8da87df
@dependabot
build(deps): bump urllib3 in /drivers/gpu/drm/ci/xfails
7e2adb7 
Bumps [urllib3](https://github.com/urllib3/urllib3) from 2.0.7 to 2.2.2.
- [Release notes](https://github.com/urllib3/urllib3/releases)
- [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst)
- [Commits](urllib3/urllib3@2.0.7...2.2.2)

---
updated-dependencies:
- dependency-name: urllib3
  dependency-version: 2.2.2
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
@dependabot dependabot bot added dependencies Pull requests that update a dependency file python Pull requests that update python code labels May 12, 2025
@dependabot Dependabot
Copy link
Author

dependabot bot commented on behalf of github Jun 19, 2025

A newer version of urllib3 exists, but since this PR has been edited by someone other than Dependabot I haven't updated it. You'll get a PR for the updated version as normal once this PR is merged.

delphix-devops-bot pushed a commit that referenced this pull request Sep 9, 2025
@smb49
nfs: handle failure of nfs_get_lock_context in unlock path
27615af 
BugLink: https://bugs.launchpad.net/bugs/2115266

[ Upstream commit c457dc1ec770a22636b473ce5d35614adfe97636 ]

When memory is insufficient, the allocation of nfs_lock_context in
nfs_get_lock_context() fails and returns -ENOMEM. If we mistakenly treat
an nfs4_unlockdata structure (whose l_ctx member has been set to -ENOMEM)
as valid and proceed to execute rpc_run_task(), this will trigger a NULL
pointer dereference in nfs4_locku_prepare. For example:

BUG: kernel NULL pointer dereference, address: 000000000000000c
PGD 0 P4D 0
Oops: Oops: 0000 [#1] SMP PTI
CPU: 15 UID: 0 PID: 12 Comm: kworker/u64:0 Not tainted 6.15.0-rc2-dirty #60
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.3-2.fc40
Workqueue: rpciod rpc_async_schedule
RIP: 0010:nfs4_locku_prepare+0x35/0xc2
Code: 89 f2 48 89 fd 48 c7 c7 68 69 ef b5 53 48 8b 8e 90 00 00 00 48 89 f3
RSP: 0018:ffffbbafc006bdb8 EFLAGS: 00010246
RAX: 000000000000004b RBX: ffff9b964fc1fa00 RCX: 0000000000000000
RDX: 0000000000000000 RSI: fffffffffffffff4 RDI: ffff9ba53fddbf40
RBP: ffff9ba539934000 R08: 0000000000000000 R09: ffffbbafc006bc38
R10: ffffffffb6b689c8 R11: 0000000000000003 R12: ffff9ba539934030
R13: 0000000000000001 R14: 0000000004248060 R15: ffffffffb56d1c30
FS: 0000000000000000(0000) GS:ffff9ba5881f0000(0000) knlGS:00000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 000000000000000c CR3: 000000093f244000 CR4: 00000000000006f0
Call Trace:
 <TASK>
 __rpc_execute+0xbc/0x480
 rpc_async_schedule+0x2f/0x40
 process_one_work+0x232/0x5d0
 worker_thread+0x1da/0x3d0
 ? __pfx_worker_thread+0x10/0x10
 kthread+0x10d/0x240
 ? __pfx_kthread+0x10/0x10
 ret_from_fork+0x34/0x50
 ? __pfx_kthread+0x10/0x10
 ret_from_fork_asm+0x1a/0x30
 </TASK>
Modules linked in:
CR2: 000000000000000c
---[ end trace 0000000000000000 ]---

Free the allocated nfs4_unlockdata when nfs_get_lock_context() fails and
return NULL to terminate subsequent rpc_run_task, preventing NULL pointer
dereference.

Fixes: f30cb75 ("NFS: Always wait for I/O completion before unlock")
Signed-off-by: Li Lingfeng <[email protected]>
Reviewed-by: Jeff Layton <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Trond Myklebust <[email protected]>
Signed-off-by: Sasha Levin <[email protected]>
CVE-2025-38023
Signed-off-by: Manuel Diewald <[email protected]>
Signed-off-by: Stefan Bader <[email protected]>
@delphix-devops-bot delphix-devops-bot force-pushed the develop branch 2 times, most recently from 29c9032 to 6760015 Compare October 3, 2025 17:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
dependencies Pull requests that update a dependency file python Pull requests that update python code
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.