From 2db8c87a005a278b338fd46f2c1e0a68a0e25df9 Mon Sep 17 00:00:00 2001 From: eaglegai Date: Tue, 10 Sep 2024 12:05:41 +0000 Subject: [PATCH] backport to fix rpc_gss_seccreate passed in credential --- ...fix-rpc_gss_seccreate-passed-in-cred.patch | 35 +++++++++++++++++++ libtirpc.spec | 6 +++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 backport-fix-rpc_gss_seccreate-passed-in-cred.patch diff --git a/backport-fix-rpc_gss_seccreate-passed-in-cred.patch b/backport-fix-rpc_gss_seccreate-passed-in-cred.patch new file mode 100644 index 0000000..40f7366 --- /dev/null +++ b/backport-fix-rpc_gss_seccreate-passed-in-cred.patch @@ -0,0 +1,35 @@ +From 22b1c0cd6076dcd7df822cd1181e98278dc865db Mon Sep 17 00:00:00 2001 +From: Olga Kornievskaia +Date: Wed, 3 Jan 2024 17:50:42 -0500 +Subject: [PATCH] gssapi: fix rpc_gss_seccreate passed in cred + +Fix rpc_gss_seccreate() usage of the passed in gss credential. + +Fixes: 5f1fe4dde861 ("Pass time_req and input_channel_bindings through to init_sec_context") + +Reviewed-by: Chuck Lever +Signed-off-by: Olga Kornievskaia +Signed-off-by: Steve Dickson +--- + src/auth_gss.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/auth_gss.c b/src/auth_gss.c +index e317664..9d18f96 100644 +--- a/src/auth_gss.c ++++ b/src/auth_gss.c +@@ -842,9 +842,9 @@ rpc_gss_seccreate(CLIENT *clnt, char *principal, char *mechanism, + gd->sec = sec; + + if (req) { +- sec.req_flags = req->req_flags; ++ gd->sec.req_flags = req->req_flags; + gd->time_req = req->time_req; +- sec.cred = req->my_cred; ++ gd->sec.cred = req->my_cred; + gd->icb = req->input_channel_bindings; + } + +-- +2.25.1 + diff --git a/libtirpc.spec b/libtirpc.spec index 10e5dab..37fc486 100644 --- a/libtirpc.spec +++ b/libtirpc.spec @@ -1,6 +1,6 @@ Name: libtirpc Version: 1.2.6 -Release: 4 +Release: 5 Summary: Transport-independent RPC library License: SISSL and BSD URL: http://git.linux-nfs.org/?p=steved/libtirpc.git;a=summary @@ -13,6 +13,7 @@ Patch05: backport-Fix-use-after-free-accessing-the-error-number.patch Patch06: backport-Eliminate-deadlocks-in-connects-with-an-MT-environment.patch Patch07: backport-clnt_dg_freeres-uncleared-set-active-state-may-deadlock.patch Patch08: backport-thread-safe-clnt-destruction.patch +Patch09: backport-fix-rpc_gss_seccreate-passed-in-cred.patch BuildRequires: automake autoconf libtool pkgconfig krb5-devel @@ -73,6 +74,9 @@ mv %{buildroot}%{_mandir}/man3 %{buildroot}%{_mandir}/man3t %{_mandir}/*/* %changelog +* Tue Sep 10 2024 gaihuiying - 1.2.6-5 +- backport to fix rpc_gss_seccreate passed in credential + * Wed Nov 16 2022 gaihuiying - 1.2.6-4 - backport to fix "mount.nfs: Cannot allocate memory" error