-
Notifications
You must be signed in to change notification settings - Fork 564
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Patch CVE-2024-11407 in grpc (#11924)
Co-authored-by: Suresh Thelkar <[email protected]> Co-authored-by: jslobodzian <[email protected]>
- Loading branch information
1 parent
1ab2242
commit ab980cc
Showing
2 changed files
with
34 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
From f3d8e3c99764e1d279326ed1ee7ba9b1bdba7a20 Mon Sep 17 00:00:00 2001 | ||
From: Vignesh Babu <[email protected]> | ||
Date: Thu, 12 Sep 2024 11:13:45 -0700 | ||
Subject: [PATCH] Fix bug in Tx0cp code path in posix endpoint. | ||
|
||
This fix ensures that the iov_base pointers point to the right address. | ||
|
||
PiperOrigin-RevId: 673923651 | ||
--- | ||
src/core/lib/event_engine/posix_engine/posix_endpoint.cc | 2 +- | ||
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
diff --git a/src/core/lib/event_engine/posix_engine/posix_endpoint.cc b/src/core/lib/event_engine/posix_engine/posix_endpoint.cc | ||
index 019c2a3..048bc54 100644 | ||
--- a/src/core/lib/event_engine/posix_engine/posix_endpoint.cc | ||
+++ b/src/core/lib/event_engine/posix_engine/posix_endpoint.cc | ||
@@ -240,7 +240,7 @@ msg_iovlen_type TcpZerocopySendRecord::PopulateIovs(size_t* unwind_slice_idx, | ||
iov_size++) { | ||
MutableSlice& slice = internal::SliceCast<MutableSlice>( | ||
buf_.MutableSliceAt(out_offset_.slice_idx)); | ||
- iov[iov_size].iov_base = slice.begin(); | ||
+ iov[iov_size].iov_base = slice.begin() + out_offset_.byte_idx; | ||
iov[iov_size].iov_len = slice.length() - out_offset_.byte_idx; | ||
*sending_length += iov[iov_size].iov_len; | ||
++(out_offset_.slice_idx); | ||
-- | ||
2.34.1 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
Summary: Open source remote procedure call (RPC) framework | ||
Name: grpc | ||
Version: 1.62.0 | ||
Release: 3%{?dist} | ||
Release: 4%{?dist} | ||
License: ASL 2.0 | ||
Vendor: Microsoft Corporation | ||
Distribution: Azure Linux | ||
|
@@ -10,6 +10,7 @@ URL: https://www.grpc.io | |
Source0: https://github.com/grpc/grpc/archive/v%{version}/%{name}-%{version}.tar.gz | ||
Source1: %{name}-%{version}-submodules.tar.gz | ||
Patch0: grpcio-cython3.patch | ||
Patch1: CVE-2024-11407.patch | ||
BuildRequires: abseil-cpp-devel >= 20240116.0-2 | ||
BuildRequires: build-essential | ||
BuildRequires: c-ares-devel | ||
|
@@ -67,9 +68,7 @@ Requires: python3-six | |
Python language bindings for gRPC. | ||
|
||
%prep | ||
%setup -q -n %{name}-%{version} | ||
%setup -T -D -a 1 | ||
%patch 0 -p1 | ||
%autosetup -n %{name}-%{version} -a 1 -p1 | ||
|
||
# remove third party code taken from installed packages (build requires) | ||
rm -r %{_builddir}/%{name}-%{version}/third_party/abseil-cpp | ||
|
@@ -153,6 +152,9 @@ export GRPC_PYTHON_CFLAGS="%{optflags} -std=c++$CXX_VERSION" | |
%{python3_sitearch}/grpcio-%{version}-py%{python3_version}.egg-info | ||
|
||
%changelog | ||
* Wed Jan 25 2024 Suresh Thelkar <[email protected]> - 1.62.0-4 | ||
- Patch CVE-2024-11407 | ||
|
||
* Thu Jul 25 2024 Devin Anderson <[email protected]> - 1.62.0-3 | ||
- Bump release to rebuild with latest 'abseil-cpp'. | ||
|
||
|