rpms/nfs-utils
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- statd: Teach nfs_compare_sockaddr() to handle NULL arguments

Browse Source
This commit is contained in:
Steve Dickson 2010-01-25 19:21:15 +00:00
parent c1fc9c166c
commit dd5c9406d5
2 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
nfs-utils-1.2.1-statd-null-addrs.patch Normal file
View File

@ -0,0 +1,31 @@
commit 6318d601cf182d2848d397af323ca9c4fbdecb97
Author: Steve Dickson <steved@redhat.com>
Date: Mon Jan 25 13:09:04 2010 -0500
Teach nfs_compare_sockaddr() to handle NULL arguments.
Reviewed-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
diff --git a/support/include/sockaddr.h b/support/include/sockaddr.h
index 732514b..9af2543 100644
--- a/support/include/sockaddr.h
+++ b/support/include/sockaddr.h
@@ -20,6 +20,7 @@
#ifndef NFS_UTILS_SOCKADDR_H
#define NFS_UTILS_SOCKADDR_H
+#include <libio.h>
#include <stdbool.h>
#include <sys/socket.h>
#include <netinet/in.h>
@@ -223,6 +224,9 @@ compare_sockaddr6(__attribute__ ((unused)) const struct sockaddr *sa1,
static inline _Bool
nfs_compare_sockaddr(const struct sockaddr *sa1, const struct sockaddr *sa2)
{
+ if (sa1 == NULL || sa2 == NULL)
+ return false;
+
if (sa1->sa_family == sa2->sa_family)
switch (sa1->sa_family) {
case AF_INET:

8
nfs-utils.spec
View File

@ -2,7 +2,7 @@ Summary: NFS utilities and supporting clients and daemons for the kernel NFS ser
Name: nfs-utils
URL: http://sourceforge.net/projects/nfs
Version: 1.2.1
Release: 14%{?dist}
Release: 15%{?dist}
Epoch: 1
# group all 32bit related archs
@ -21,6 +21,7 @@ Source15: nfs.sysconfig
Patch000: nfs-utils-1.2.2-rc9.patch
Patch001: nfs-utils-1.2.1-statdpath.patch
Patch002: nfs-utils-1.2.1-default-family.patch
Patch003: nfs-utils-1.2.1-statd-null-addrs.patch
Patch100: nfs-utils-1.2.1-statdpath-man.patch
Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch
@ -75,6 +76,7 @@ This package also contains the mount.nfs and umount.nfs program.
%patch000 -p1
%patch001 -p1
%patch002 -p1
%patch003 -p1
%patch100 -p1
%patch101 -p1
@ -251,6 +253,10 @@ fi
%attr(4755,root,root) /sbin/umount.nfs4
%changelog
* Mon Jan 25 2010 Steve Dickson <steved@redhat.com> 1.2.1-15
- statd: Teach nfs_compare_sockaddr() to handle NULL
arguments
* Fri Jan 22 2010 Steve Dickson <steved@redhat.com> 1.2.1-14
- Update to upstream RC release: nfs-utils-1-2-2-rc9