[libtirpc/f15] Fixed segfault in SVCAUTH_WRAP call (bz 722594)
Steve Dickson
steved at fedoraproject.org
Wed Jul 20 15:11:10 UTC 2011
commit 03e81b39153d7d05a85c3dc17398b5be09d18fcc
Author: Steve Dickson <steved at redhat.com>
Date: Wed Jul 20 11:10:01 2011 -0400
Fixed segfault in SVCAUTH_WRAP call (bz 722594)
Signed-off-by: Steve Dickson <steved at redhat.com>
libtirpc-0.2.2-wrap-segfault.patch | 28 ++++++++++++++++++++++++++++
libtirpc.spec | 7 ++++++-
2 files changed, 34 insertions(+), 1 deletions(-)
---
diff --git a/libtirpc-0.2.2-wrap-segfault.patch b/libtirpc-0.2.2-wrap-segfault.patch
new file mode 100644
index 0000000..8a04c16
--- /dev/null
+++ b/libtirpc-0.2.2-wrap-segfault.patch
@@ -0,0 +1,28 @@
+diff -up libtirpc-0.2.2/src/svc_dg.c.orig libtirpc-0.2.2/src/svc_dg.c
+--- libtirpc-0.2.2/src/svc_dg.c.orig 2011-07-19 15:02:41.087631000 -0400
++++ libtirpc-0.2.2/src/svc_dg.c 2011-07-19 15:04:43.154243000 -0400
+@@ -254,8 +254,8 @@ svc_dg_reply(xprt, msg)
+ XDR_SETPOS(xdrs, 0);
+ msg->rm_xid = su->su_xid;
+ if (xdr_replymsg(xdrs, msg) &&
+- (!has_args ||
+- (SVCAUTH_WRAP(xprt->xp_auth, xdrs, xdr_results, xdr_location)))) {
++ (!has_args || (xprt->xp_auth &&
++ SVCAUTH_WRAP(xprt->xp_auth, xdrs, xdr_results, xdr_location)))) {
+ struct msghdr *msg = &su->su_msghdr;
+ struct iovec iov;
+
+diff -up libtirpc-0.2.2/src/svc_vc.c.orig libtirpc-0.2.2/src/svc_vc.c
+--- libtirpc-0.2.2/src/svc_vc.c.orig 2011-07-19 15:05:28.577588000 -0400
++++ libtirpc-0.2.2/src/svc_vc.c 2011-07-19 15:05:40.058928000 -0400
+@@ -698,8 +698,8 @@ svc_vc_reply(xprt, msg)
+ msg->rm_xid = cd->x_id;
+ rstat = FALSE;
+ if (xdr_replymsg(xdrs, msg) &&
+- (!has_args ||
+- (SVCAUTH_WRAP(xprt->xp_auth, xdrs, xdr_results, xdr_location)))) {
++ (!has_args || (xprt->xp_auth &&
++ SVCAUTH_WRAP(xprt->xp_auth, xdrs, xdr_results, xdr_location)))) {
+ rstat = TRUE;
+ }
+ (void)xdrrec_endofrecord(xdrs, TRUE);
diff --git a/libtirpc.spec b/libtirpc.spec
index 0f2ee77..3dca48e 100644
--- a/libtirpc.spec
+++ b/libtirpc.spec
@@ -2,13 +2,14 @@
Name: libtirpc
Version: 0.2.2
-Release: 1%{?dist}
+Release: 1.1%{?dist}
Summary: Transport Independent RPC Library
Group: System Environment/Libraries
License: SISSL and BSD
URL: http://nfsv4.bullopensource.org/
Patch001: libtirpc-0.2.3-rc1.patch
+Patch002: libtirpc-0.2.2-wrap-segfault.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: http://downloads.sourceforge.net/libtirpc/libtirpc-%{version}.tar.bz2
@@ -43,6 +44,7 @@ developing programs which use the tirpc library.
%setup -q
%patch001 -p1
+%patch002 -p1
# Remove .orig files
find . -name "*.orig" | xargs rm -f
@@ -131,6 +133,9 @@ rm -rf %{buildroot}
%{_mandir}/*/*
%changelog
+* Wed Jul 20 2011 Steve Dickson <steved at redhat.com> 0.2.2.1.1
+- Fixed segfault in SVCAUTH_WRAP call (bz 722594)
+
* Tue Jun 21 2011 Steve Dickson <steved at redhat.com> 0.2.2.1
- Updated to the latest upstream release: 0.2.2-rc1
More information about the scm-commits
mailing list