aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorSimo Leone <simo@archlinux.org>2009-06-24 22:44:43 -0400
committerSteve French <sfrench@us.ibm.com>2009-06-24 22:44:43 -0400
commit6debdbc0ba6253ac519cd5a3d22e30f1f9f1dd12 (patch)
tree523ef732a835d25a30d997bbff6fcf8321360857 /fs
parent6459340cfcc6f6d165b27c3dd955aeb55a1b73d3 (diff)
[CIFS] Copy struct *after* setting the port, instead of before.
Acked-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Simo Leone <simo@archlinux.org> Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/cifs/connect.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index a581cfa2ba82..12c2cf693555 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -1496,14 +1496,14 @@ cifs_get_tcp_session(struct smb_vol *volume_info)
1496 cFYI(1, ("attempting ipv6 connect")); 1496 cFYI(1, ("attempting ipv6 connect"));
1497 /* BB should we allow ipv6 on port 139? */ 1497 /* BB should we allow ipv6 on port 139? */
1498 /* other OS never observed in Wild doing 139 with v6 */ 1498 /* other OS never observed in Wild doing 139 with v6 */
1499 sin_server6->sin6_port = htons(volume_info->port);
1499 memcpy(&tcp_ses->addr.sockAddr6, sin_server6, 1500 memcpy(&tcp_ses->addr.sockAddr6, sin_server6,
1500 sizeof(struct sockaddr_in6)); 1501 sizeof(struct sockaddr_in6));
1501 sin_server6->sin6_port = htons(volume_info->port);
1502 rc = ipv6_connect(tcp_ses); 1502 rc = ipv6_connect(tcp_ses);
1503 } else { 1503 } else {
1504 sin_server->sin_port = htons(volume_info->port);
1504 memcpy(&tcp_ses->addr.sockAddr, sin_server, 1505 memcpy(&tcp_ses->addr.sockAddr, sin_server,
1505 sizeof(struct sockaddr_in)); 1506 sizeof(struct sockaddr_in));
1506 sin_server->sin_port = htons(volume_info->port);
1507 rc = ipv4_connect(tcp_ses); 1507 rc = ipv4_connect(tcp_ses);
1508 } 1508 }
1509 if (rc < 0) { 1509 if (rc < 0) {