rpms/kernel/F-11 linux-2.6-fs-cifs-fix-port-numbers.patch, NONE, 1.1 kernel.spec, 1.1665, 1.1666

[Chuck Ebbert]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24894

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-fs-cifs-fix-port-numbers.patch 
Log Message:
Fix "port=" option in CIFS mount calls. (#506574)

linux-2.6-fs-cifs-fix-port-numbers.patch:

--- NEW FILE linux-2.6-fs-cifs-fix-port-numbers.patch ---
From: Simo Leone <simo at archlinux.org>
Date: Thu, 25 Jun 2009 02:44:43 +0000 (+0000)
Subject: [CIFS] Copy struct *after* setting the port, instead of before.
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=6debdbc0ba6253ac519cd5a3d22e30f1f9f1dd12

[CIFS] Copy struct *after* setting the port, instead of before.

Acked-by: Jeff Layton <jlayton at redhat.com>
Signed-off-by: Simo Leone <simo at archlinux.org>
Signed-off-by: Steve French <sfrench at us.ibm.com>
---

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index a581cfa..12c2cf6 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -1496,14 +1496,14 @@ cifs_get_tcp_session(struct smb_vol *volume_info)
 		cFYI(1, ("attempting ipv6 connect"));
 		/* BB should we allow ipv6 on port 139? */
 		/* other OS never observed in Wild doing 139 with v6 */
+		sin_server6->sin6_port = htons(volume_info->port);
 		memcpy(&tcp_ses->addr.sockAddr6, sin_server6,
 			sizeof(struct sockaddr_in6));
-		sin_server6->sin6_port = htons(volume_info->port);
 		rc = ipv6_connect(tcp_ses);
 	} else {
+		sin_server->sin_port = htons(volume_info->port);
 		memcpy(&tcp_ses->addr.sockAddr, sin_server,
 			sizeof(struct sockaddr_in));
-		sin_server->sin_port = htons(volume_info->port);
 		rc = ipv4_connect(tcp_ses);
 	}
 	if (rc < 0) {


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1665
retrieving revision 1.1666
diff -u -p -r1.1665 -r1.1666
--- kernel.spec	29 Jun 2009 18:42:41 -0000	1.1665
+++ kernel.spec	29 Jun 2009 20:02:54 -0000	1.1666
@@ -762,6 +762,9 @@ Patch5000: linux-2.6-add-qcserial.patch
 # fix squashfs on systems where pagesize > blocksize (ia64, ppc64 w/64k pages)
 Patch6010: squashfs-broken-when-pagesize-greater-than-blocksize.patch
 
+# CIFS
+Patch6100: linux-2.6-fs-cifs-fix-port-numbers.patch
+
 Patch9001: revert-fix-modules_install-via-nfs.patch
 Patch9010: linux-2.6-nfsd-report-short-writes.patch
 
@@ -1465,6 +1468,9 @@ ApplyPatch linux-2.6-dropwatch-protocol.
 ApplyPatch squashfs-broken-when-pagesize-greater-than-blocksize.patch
 # fix nfs reporting of short writes (#493500)
 ApplyPatch linux-2.6-nfsd-report-short-writes.patch
+# fix cifs mount option "port=" (#506574)
+ApplyPatch linux-2.6-fs-cifs-fix-port-numbers.patch
+
 # cpufreq
 ApplyPatch cpufreq-add-atom-to-p4-clockmod.patch
 ApplyPatch linux-2.6-cpufreq-enable-acpi-pstates-on-via.patch
@@ -2077,6 +2083,9 @@ fi
 # and build.
 
 %changelog
+* Mon Jun 29 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.5-204
+- Fix "port=" option in CIFS mount calls. (#506574)
+
 * Mon Jun 29 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.5-203
 - Add support for Apple mini keyboard (#507517)