From 0b666207596560118dee0b52565e4ce434b55949 Mon Sep 17 00:00:00 2001 From: Steve Dickson Date: Feb 17 2009 21:02:55 +0000 Subject: - Integrated the upstream fix for bz 483375 - mount: segmentation faults on UDP mounts (bz 485448) --- diff --git a/nfs-utils-1.1.4-mount-nolock.patch b/nfs-utils-1.1.4-mount-nolock.patch new file mode 100644 index 0000000..5c0da19 --- /dev/null +++ b/nfs-utils-1.1.4-mount-nolock.patch @@ -0,0 +1,139 @@ +commit e7ec5e745e851ad10c56d579463ee7e1b85c9c21 +Author: Chuck Lever +Date: Tue Feb 17 15:19:58 2009 -0500 + + text-based mount command: fix return value from po_rightmost() + + Recently commit 0dcb83a8 changed the po_rightmost() function to + distinguish among several possible mount options by taking a table + containing the alternatives, and returning the table index of the + entry which is rightmost in the mount option string. + + If it didn't find any mount option that matches an entry from the + passed-in table, it returned zero. This was the same behavior it had + before, when it only checked for two options at a time. It returned + PO_NEITHER_FOUND, which was zero. + + Since this is C, however, zero also happens to be a valid index into + the passed-in array of options. + + Modify the po_rightmost() function to return -1 if the entry wasn't + found, and fix up the callers to look for a C-style array index that + starts at zero. + + Thanks to Steve Dickson for troubleshooting the problem. His solution + was merely to bump the return value, as callers already expected an + ordinal index instead of a C-style index. + + I prefer this equivalent but slightly more extensive change because it + makes the behavior of po_rightmost() more closely match how humans + understand C arrays to work. Let's address some of the confusion that + caused this bug, as well as fixing the run-time behavior. + + Signed-off-by: Chuck Lever + Signed-off-by: Steve Dickson + +diff -up nfs-utils-1.1.4/utils/mount/network.c.orig nfs-utils-1.1.4/utils/mount/network.c +--- nfs-utils-1.1.4/utils/mount/network.c.orig 2009-02-17 15:51:27.000000000 -0500 ++++ nfs-utils-1.1.4/utils/mount/network.c 2009-02-17 15:52:13.000000000 -0500 +@@ -1168,16 +1168,16 @@ static rpcvers_t nfs_nfs_version(struct + long tmp; + + switch (po_rightmost(options, nfs_version_opttbl)) { +- case 1: /* v2 */ ++ case 0: /* v2 */ + return 2; +- case 2: /* v3 */ ++ case 1: /* v3 */ + return 3; +- case 3: /* vers */ ++ case 2: /* vers */ + if (po_get_numeric(options, "vers", &tmp) == PO_FOUND) + if (tmp >= 2 && tmp <= 3) + return tmp; + break; +- case 4: /* nfsvers */ ++ case 3: /* nfsvers */ + if (po_get_numeric(options, "nfsvers", &tmp) == PO_FOUND) + if (tmp >= 2 && tmp <= 3) + return tmp; +@@ -1198,11 +1198,9 @@ static unsigned short nfs_nfs_protocol(s + char *option; + + switch (po_rightmost(options, nfs_transport_opttbl)) { +- case 1: /* udp */ +- return IPPROTO_UDP; +- case 2: /* tcp */ ++ case 1: /* tcp */ + return IPPROTO_TCP; +- case 3: /* proto */ ++ case 2: /* proto */ + option = po_get(options, "proto"); + if (option) { + if (strcmp(option, "tcp") == 0) +@@ -1211,6 +1209,7 @@ static unsigned short nfs_nfs_protocol(s + return IPPROTO_UDP; + } + } ++ + return IPPROTO_UDP; + } + +diff -up nfs-utils-1.1.4/utils/mount/parse_opt.c.orig nfs-utils-1.1.4/utils/mount/parse_opt.c +--- nfs-utils-1.1.4/utils/mount/parse_opt.c.orig 2009-02-17 15:51:27.000000000 -0500 ++++ nfs-utils-1.1.4/utils/mount/parse_opt.c 2009-02-17 15:52:13.000000000 -0500 +@@ -437,9 +437,10 @@ po_found_t po_get_numeric(struct mount_o + * as "proto=," "udp" and "tcp." + * + * Returns the index into @keys of the option that is rightmost. +- * If none of the options are present, returns zero. ++ * If none of the options listed in @keys is present in @options, or ++ * if @options is NULL, returns -1. + */ +-unsigned int po_rightmost(struct mount_options *options, const char *keys[]) ++int po_rightmost(struct mount_options *options, const char *keys[]) + { + struct mount_option *option; + unsigned int i; +@@ -452,7 +453,7 @@ unsigned int po_rightmost(struct mount_o + } + } + +- return 0; ++ return -1; + } + + /** +diff -up nfs-utils-1.1.4/utils/mount/parse_opt.h.orig nfs-utils-1.1.4/utils/mount/parse_opt.h +--- nfs-utils-1.1.4/utils/mount/parse_opt.h.orig 2009-02-17 15:51:27.000000000 -0500 ++++ nfs-utils-1.1.4/utils/mount/parse_opt.h 2009-02-17 15:52:13.000000000 -0500 +@@ -47,7 +47,7 @@ po_found_t po_contains(struct mount_opt + char * po_get(struct mount_options *, char *); + po_found_t po_get_numeric(struct mount_options *, + char *, long *); +-unsigned int po_rightmost(struct mount_options *, ++int po_rightmost(struct mount_options *, + const char *keys[]); + po_found_t po_remove_all(struct mount_options *, char *); + void po_destroy(struct mount_options *); +diff -up nfs-utils-1.1.4/utils/mount/stropts.c.orig nfs-utils-1.1.4/utils/mount/stropts.c +--- nfs-utils-1.1.4/utils/mount/stropts.c.orig 2009-02-17 15:51:27.000000000 -0500 ++++ nfs-utils-1.1.4/utils/mount/stropts.c 2009-02-17 15:52:13.000000000 -0500 +@@ -232,7 +232,7 @@ static const char *nfs_lock_opttbl[] = { + + static int nfs_verify_lock_option(struct mount_options *options) + { +- if (po_rightmost(options, nfs_lock_opttbl) == 1) ++ if (po_rightmost(options, nfs_lock_opttbl) == 0) + return 1; + + if (!start_statd()) { +@@ -756,7 +756,7 @@ static int nfsmount_start(struct nfsmoun + if (!nfs_validate_options(mi)) + return EX_FAIL; + +- if (po_rightmost(mi->options, nfs_background_opttbl) == 1) ++ if (po_rightmost(mi->options, nfs_background_opttbl) == 0) + return nfsmount_bg(mi); + else + return nfsmount_fg(mi); diff --git a/nfs-utils-1.1.4-mount-textbased.patch b/nfs-utils-1.1.4-mount-textbased.patch index 32a94e2..d941ce8 100644 --- a/nfs-utils-1.1.4-mount-textbased.patch +++ b/nfs-utils-1.1.4-mount-textbased.patch @@ -61,7 +61,7 @@ index f61d0dd..4934508 100644 - return PO_KEY1_RIGHTMOST; + for (i = 0; keys[i] != NULL; i++) + if (strcmp(option->keyword, keys[i]) == 0) -+ return i+1; ++ return i; } } diff --git a/nfs-utils-1.1.4-mount-udponly.patch b/nfs-utils-1.1.4-mount-udponly.patch new file mode 100644 index 0000000..cd2115e --- /dev/null +++ b/nfs-utils-1.1.4-mount-udponly.patch @@ -0,0 +1,27 @@ +commit 52ec1b5fceece8f63b97afc6d6b78bfabff12669 +Author: Steve Dickson +Date: Tue Feb 17 15:33:58 2009 -0500 + + The mount sockaddr len (mnt_salen) is not be set in + nfs_extract_server_addresses() which causes the mount.nfs + command to segmentation fault when a NFS server only + supports UDP mounts. + + Signed-off-by: Steve Dickson + +diff -up nfs-utils-1.1.4/utils/mount/stropts.c.orig nfs-utils-1.1.4/utils/mount/stropts.c +--- nfs-utils-1.1.4/utils/mount/stropts.c.orig 2009-02-17 15:55:53.000000000 -0500 ++++ nfs-utils-1.1.4/utils/mount/stropts.c 2009-02-17 15:58:15.000000000 -0500 +@@ -331,9 +331,10 @@ static int nfs_extract_server_addresses( + return 0; + + option = po_get(options, "mountaddr"); +- if (option == NULL) ++ if (option == NULL) { + memcpy(mnt_saddr, nfs_saddr, *nfs_salen); +- else if (!nfs_string_to_sockaddr(option, strlen(option), ++ *mnt_salen = *nfs_salen; ++ } else if (!nfs_string_to_sockaddr(option, strlen(option), + mnt_saddr, mnt_salen)) + return 0; + diff --git a/nfs-utils.spec b/nfs-utils.spec index 15a397b..9eabe66 100644 --- a/nfs-utils.spec +++ b/nfs-utils.spec @@ -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.1.4 -Release: 16%{?dist} +Release: 17%{?dist} Epoch: 1 # group all 32bit related archs @@ -48,6 +48,8 @@ Patch118: nfs-utils-1.1.4-tcpwrap-hash.patch Patch119: nfs-utils-1.1.4-tcpwrap-newrules.patch Patch120: nfs-utils-1.1.4-tcpwrap-cleanup.patch Patch121: nfs-utils-1.1.4-mount-textbased.patch +Patch122: nfs-utils-1.1.4-mount-nolock.patch +Patch123: nfs-utils-1.1.4-mount-udponly.patch %if %{enablefscache} Patch90: nfs-utils-1.1.0-mount-fsc.patch @@ -124,6 +126,8 @@ This package also contains the mount.nfs and umount.nfs program. %patch119 -p1 %patch120 -p1 %patch121 -p1 +%patch122 -p1 +%patch123 -p1 %if %{enablefscache} %patch90 -p1 @@ -287,6 +291,10 @@ fi %attr(4755,root,root) /sbin/umount.nfs4 %changelog +* Tue Feb 17 2009 Steve Dickson 1.1.4-17 +- Integrated the upstream fix for bz 483375 +- mount: segmentation faults on UDP mounts (bz 485448) + * Sat Jan 31 2009 Steve Dickson 1.1.4-16 - Fixed typo in -mount-textbased.patch (bz 483375)