cifs: Allow binding to local IP address.
Subsystems (2)
PATCH v3 1/1 cifs: Allow binding to local IP address.
When using multi-homed machines, it's nice to be able to specify the local IP to use for outbound connections. This patch gives cifs the ability to bind to a particular IP address.
Usage: mount -t cifs -o srcaddr=192.168.1.50,user=foo, ...
Usage: mount -t cifs -o srcaddr=2002::100:1,user=foo, ...
---
:100644 100644 b7431af... ac69602... M fs/cifs/cifsfs.c
:100644 100644 d82f5fb... d6f0a7d... M fs/cifs/cifsfs.h
:100644 100644 c9d0cfc... 784fd4a... M fs/cifs/cifsglob.h
:100644 100644 ec0ea4a... c70f6f8... M fs/cifs/connect.c
fs/cifs/cifsfs.c | 30 +++++++++++++++++ fs/cifs/cifsfs.h | 3 ++ fs/cifs/cifsglob.h | 1 + fs/cifs/connect.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 125 insertions(+), 2 deletions(-)
fs/cifs/cifsfs.c +30 -0
@@ -36,6 +36,7 @@#include <linux/kthread.h> #include <linux/freezer.h> #include <linux/smp_lock.h> +#include <net/ipv6.h> #include "cifsfs.h" #include "cifspdu.h" #define DECLARE_GLOBALS_HERE
@@ -357,6 +358,20 @@ cifs_show_address(struct seq_file *s, struct TCP_Server_Info *server) } } +bool +cifs_addr_is_specified (struct sockaddr *srcaddr) { +struct sockaddr_in *saddr4 = (struct sockaddr_in *)srcaddr; +struct sockaddr_in6 *saddr6 = (struct sockaddr_in6 *)srcaddr; +static const struct in6_addr c_in6addr_any =IN6ADDR_ANY_INIT ; +switch (srcaddr->sa_family) { +case AF_INET : +return saddr4->sin_addr.s_addr !=0 ; +case AF_INET6 : +return (!ipv6_addr_equal (&c_in6addr_any, &saddr6->sin6_addr)); + } +return false; +} +/* * cifs_show_options() is for displaying mount options in /proc/mounts. * Not all settable options are displayed but most of the important
@@ -367,6 +382,8 @@ cifs_show_options(struct seq_file *s, struct vfsmount *m) {struct cifs_sb_info *cifs_sb =CIFS_SB (m->mnt_sb);struct cifsTconInfo *tcon = cifs_sb->tcon; +struct sockaddr *srcaddr; + srcaddr = (struct sockaddr *)(&tcon->ses->server->srcaddr);seq_printf (s,",unc=%s" , tcon->treeName);if (tcon->ses->userName)
@@ -374,6 +391,19 @@ cifs_show_options(struct seq_file *s, struct vfsmount *m)if (tcon->ses->domainName)seq_printf (s,",domain=%s" , tcon->ses->domainName); +if (cifs_addr_is_specified (srcaddr)) { +struct sockaddr_in *saddr4; +struct sockaddr_in6 *saddr6; + saddr4 = (struct sockaddr_in *)srcaddr; + saddr6 = (struct sockaddr_in6 *)srcaddr; +if (saddr6->sin6_family ==AF_INET6 ) +seq_printf (s,",srcaddr=%pI6c" , + &saddr6->sin6_addr); +else +seq_printf (s,",srcaddr=%pI4" , + &saddr4->sin_addr.s_addr); + } +seq_printf (s,",uid=%d" , cifs_sb->mnt_uid);if (cifs_sb->mnt_cifs_flags &CIFS_MOUNT_OVERR_UID )seq_printf (s,",forceuid" );
fs/cifs/cifsfs.h +3 -0
@@ -110,6 +110,9 @@ extern ssize_t cifs_getxattr(struct dentry *, const char *, void *, size_t);extern ssize_t cifs_listxattr (struct dentry *,char *,size_t );extern long cifs_ioctl (struct file *filep,unsigned int cmd,unsigned long arg); +struct sockaddr ; +extern bool cifs_addr_is_specified (struct sockaddr *srcaddr); +#ifdef CONFIG_CIFS_EXPERIMENTAL extern const struct export_operations cifs_export_ops;#endif /* EXPERIMENTAL */
fs/cifs/cifsglob.h +1 -0
@@ -157,6 +157,7 @@ struct TCP_Server_Info {struct sockaddr_in sockAddr;struct sockaddr_in6 sockAddr6; } addr; +struct sockaddr_storage srcaddr;/* locally bind to this IP */ wait_queue_head_t response_q;wait_queue_head_t request_q;/* if more than maxmpx to srvr must block*/ struct list_head pending_mid_q;
fs/cifs/connect.c +91 -2
154 lines not on this page · raw message
Signature · 1 line
1.6.2.5
A message that is not in the archive (sent off-list or not yet received): 1283284514-25588-1-git-send-email-greearb-my8/[email protected]
Quoted 39 lines · On Tue, 31 Aug 2010 12:55:14 -0700 Ben Greear…
When using multi-homed machines, it's nice to be able to specify the local IP to use for outbound connections. This patch gives cifs the ability to bind to a particular IP address.
Usage: mount -t cifs -o srcaddr=192.168.1.50,user=foo, ... Usage: mount -t cifs -o srcaddr=2002::100:1,user=foo, ...Signed-off-by Ben Greear <greearb-my8/[email protected]>---
:100644 100644 b7431af... ac69602... Mfs/cifs/cifsfs.c
:100644 100644 d82f5fb... d6f0a7d... Mfs/cifs/cifsfs.h
:100644 100644 c9d0cfc... 784fd4a... Mfs/cifs/cifsglob.h
:100644 100644 ec0ea4a... c70f6f8... Mfs/cifs/connect.cfs/cifs/cifsfs.c | 30 +++++++++++++++++ fs/cifs/cifsfs.h | 3 ++ fs/cifs/cifsglob.h | 1 + fs/cifs/connect.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 125 insertions(+), 2 deletions(-)fs/cifs/cifsfs.c +5
-0@@ -36,6 +36,7 @@#include <linux/kthread.h> #include <linux/freezer.h> #include <linux/smp_lock.h> +#include <net/ipv6.h> #include "cifsfs.h" #include "cifspdu.h" #define DECLARE_GLOBALS_HERE @@ -357,6 +358,20 @@ cifs_show_address(struct seq_file *s, struct TCP_Server_Info *server) } } +bool +cifs_addr_is_specified (struct sockaddr *srcaddr) { +struct sockaddr_in *saddr4 = (struct sockaddr_in *)srcaddr; +struct sockaddr_in6 *saddr6 = (struct sockaddr_in6 *)srcaddr;
fs/cifs/cifsfs.c cifs_show_address(struct seq_file *s, struct TCP_Server_Info *server) · line 374
Quoted 10 lines
fs/cifs/cifsfs.c +10
-0+static const struct in6_addr c_in6addr_any =IN6ADDR_ANY_INIT ; +switch (srcaddr->sa_family) { +case AF_INET : +return saddr4->sin_addr.s_addr !=0 ; +case AF_INET6 : +return (!ipv6_addr_equal (&c_in6addr_any, &saddr6->sin6_addr)); + } +return false; +} +
I don't think you need all of this. cifs_addr_is_specified ought to just be srcaddr->sa_family != AF_UNSPEC. That could be a static inline or macro, even.
Quoted 126 lines
fs/cifs/cifsfs.c +15
-0/* * cifs_show_options() is for displaying mount options in /proc/mounts. * Not all settable options are displayed but most of the important @@ -367,6 +382,8 @@ cifs_show_options(struct seq_file *s, struct vfsmount *m) {struct cifs_sb_info *cifs_sb =CIFS_SB (m->mnt_sb);struct cifsTconInfo *tcon = cifs_sb->tcon; +struct sockaddr *srcaddr; + srcaddr = (struct sockaddr *)(&tcon->ses->server->srcaddr);seq_printf (s,",unc=%s" , tcon->treeName);if (tcon->ses->userName)@@ -374,6 +391,19 @@ cifs_show_options(struct seq_file *s, struct vfsmount *m)if (tcon->ses->domainName)seq_printf (s,",domain=%s" , tcon->ses->domainName); +if (cifs_addr_is_specified (srcaddr)) { +struct sockaddr_in *saddr4; +struct sockaddr_in6 *saddr6; + saddr4 = (struct sockaddr_in *)srcaddr; + saddr6 = (struct sockaddr_in6 *)srcaddr; +if (saddr6->sin6_family ==AF_INET6 ) +seq_printf (s,",srcaddr=%pI6c" , + &saddr6->sin6_addr); +else +seq_printf (s,",srcaddr=%pI4" , + &saddr4->sin_addr.s_addr); + } +seq_printf (s,",uid=%d" , cifs_sb->mnt_uid);if (cifs_sb->mnt_cifs_flags &CIFS_MOUNT_OVERR_UID )seq_printf (s,",forceuid" );fs/cifs/cifsfs.h +3
-0@@ -110,6 +110,9 @@ extern ssize_t cifs_getxattr(struct dentry *, const char *, void *, size_t);extern ssize_t cifs_listxattr (struct dentry *,char *,size_t );extern long cifs_ioctl (struct file *filep,unsigned int cmd,unsigned long arg); +struct sockaddr ; +extern bool cifs_addr_is_specified (struct sockaddr *srcaddr); +#ifdef CONFIG_CIFS_EXPERIMENTAL extern const struct export_operations cifs_export_ops;#endif /* EXPERIMENTAL */ fs/cifs/cifsglob.h +1
-0@@ -157,6 +157,7 @@ struct TCP_Server_Info {struct sockaddr_in sockAddr;struct sockaddr_in6 sockAddr6; } addr; +struct sockaddr_storage srcaddr;/* locally bind to this IP */ wait_queue_head_t response_q;wait_queue_head_t request_q;/* if more than maxmpx to srvr must block*/ struct list_head pending_mid_q;fs/cifs/connect.c +39
-0@@ -49,6 +49,7 @@#include "rfc1002pdu.h" #include "cn_cifs.h" #include "fscache.h" +#include "cifsfs.h" #define CIFS_PORT 445#define RFC1001_PORT 139@@ -105,6 +106,7 @@ struct smb_vol { bool sockopt_tcp_nodelay:1;unsigned short int port;char *prepath; +struct sockaddr_storage srcaddr;/* allow binding to a local IP */ struct nls_table *local_nls; };@@ -1064,6 +1066,22 @@ cifs_parse_mount_options(char *options, const char *devname, "long\n");return 1 ; } + }else if (strnicmp (data,"srcaddr" ,8 ) ==0 ) { + vol->srcaddr.ss_family =AF_UNSPEC ; + +if (!value || !*value) { +printk (KERN_WARNING "CIFS: srcaddr value" +" not specified.\n" ); +return 1 ;/* needs_arg; */ + } + i =cifs_convert_address ((struct sockaddr *)&vol->srcaddr, + value,strlen (value)); +if (i <0 ) { +printk (KERN_WARNING "CIFS: Could not parse" +" srcaddr: %s\n" , + value); +return 1 ; + } }else if (strnicmp (data,"prefixpath" ,10 ) ==0 ) {if (!value || !*value) { printk(KERN_WARNING@@ -1392,8 +1410,42 @@ cifs_parse_mount_options(char *options, const char *devname,return 0 ; } +/** Returns true if srcaddr isn't specified and rhs isn't +* specified, or if srcaddr is specified and +* matches the IP address of the rhs argument. +*/ +static bool +srcip_matches (struct sockaddr *srcaddr,struct sockaddr *rhs) +{ +if (cifs_addr_is_specified (srcaddr)) { +struct sockaddr_in *saddr4 = (struct sockaddr_in *)srcaddr; +struct sockaddr_in6 *saddr6 = (struct sockaddr_in6 *)srcaddr; +struct sockaddr_in *vaddr4 = (struct sockaddr_in *)rhs; +struct sockaddr_in6 *vaddr6 = (struct sockaddr_in6 *)&rhs; + +switch (srcaddr->sa_family) { +case AF_INET : +if (saddr4->sin_addr.s_addr != vaddr4->sin_addr.s_addr) +return false; +break ; +case AF_INET6 : +if (!ipv6_addr_equal (&saddr6->sin6_addr, + &vaddr6->sin6_addr))
fs/cifs/connect.c cifs_parse_mount_options(char *options, const char *devname, · line 1443
Quoted 10 lines
fs/cifs/connect.c +10
-0+return false; +break ; +default : +return false; + } +return true; + } +else +return !cifs_addr_is_specified (rhs); +}
This is more complicated than it really needs to be I think. I think all what you really need to do here is check to see if the address families match. If they do and they're either AF_INET flavor, then check to see if the addresses match. You might even be able to reuse some of the code in match_address here.
Quoted 56 lines
fs/cifs/connect.c +25
-2+ +static bool -match_address (struct TCP_Server_Info *server,struct sockaddr *addr) +match_address (struct TCP_Server_Info *server,struct sockaddr *addr, +struct sockaddr *srcaddr) {struct sockaddr_in *addr4 = (struct sockaddr_in *)addr;struct sockaddr_in6 *addr6 = (struct sockaddr_in6 *)addr;@@ -1420,6 +1472,9 @@ match_address(struct TCP_Server_Info *server, struct sockaddr *addr)break ; } +if (!srcip_matches (srcaddr, (struct sockaddr *)&server->srcaddr)) +return false; +return true; }@@ -1487,7 +1542,8 @@ cifs_find_tcp_session(struct sockaddr *addr, struct smb_vol *vol)if (server->tcpStatus == CifsNew)continue ; -if (!match_address (server, addr)) +if (!match_address (server, addr, + (struct sockaddr *)&vol->srcaddr))continue ;if (!match_security (server, vol))@@ -1602,6 +1658,8 @@ cifs_get_tcp_session(struct smb_vol *volume_info)* no need to spinlock this init of tcpStatus or srv_count */ tcp_ses->tcpStatus = CifsNew; +memcpy (&tcp_ses->srcaddr, &volume_info->srcaddr, +sizeof (tcp_ses->srcaddr)); ++tcp_ses->srv_count;if (addr.ss_family ==AF_INET6 ) {@@ -2026,6 +2084,33 @@ static void rfc1002mangle(char *target, char *source, unsigned int length) } +static int +bind_socket (struct TCP_Server_Info *server) +{ +int rc =0 ; +if (cifs_addr_is_specified ((struct sockaddr *)&server->srcaddr)) { +/* Bind to the local IP address if specified */ +struct socket *socket = server->ssocket; + rc = socket->ops->bind (socket, + (struct sockaddr *) &server->srcaddr, +sizeof (server->srcaddr)); +if (rc <0 ) { +struct sockaddr_in *saddr4; +struct sockaddr_in6 *saddr6; + saddr4 = (struct sockaddr_in *)&server->srcaddr;
fs/cifs/connect.c static void rfc1002mangle(char *target, char *source, unsigned int length) · line 2110
Quoted 10 lines
fs/cifs/connect.c +10
-0+ saddr6 = (struct sockaddr_in6 *)&server->srcaddr; +if (saddr6->sin6_family ==AF_INET6 ) +printk (KERN_WARNING "cifs: " +"Failed to bind to: %pI6c, error: %d\n" , + &saddr6->sin6_addr, rc); +else +printk (KERN_WARNING "cifs: " +"Failed to bind to: %pI4, error: %d\n" , + &saddr4->sin_addr.s_addr, rc); + }
^^^^^^^^^^^
For better or worse, the CIFS code uses the cFYI and cERROR macros for printk's. You should probably do the same here.
Quoted 16 lines
fs/cifs/connect.c +5
-0+ } +return rc; +}static int ipv4_connect (struct TCP_Server_Info *server)@@ -2051,6 +2136,8 @@ ipv4_connect(struct TCP_Server_Info *server)cifs_reclassify_socket4 (socket); } +bind_socket (server); +/* user overrode default port */ if (server->addr.sockAddr.sin_port) { rc = socket->ops->connect(socket, (struct sockaddr *)
fs/cifs/connect.c ipv6_connect(struct TCP_Server_Info *server) · line 2304
Quoted 5 lines
fs/cifs/connect.c +2
-0@@ -2213,6 +2300,8 @@ ipv6_connect(struct TCP_Server_Info *server)cifs_reclassify_socket6 (socket); } +bind_socket (server); +
^^^^
The printk's are nice and all, but shouldn't you fail the ipv[4,6]_connect if the socket can't be bound?
Quoted 3 lines
fs/cifs/connect.c +0
-0/* user overrode default port */ if (server->addr.sockAddr6.sin6_port) { rc = socket->ops->connect(socket,
Signature · 1 line
Jeff Layton <[email protected]>
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): AANLkTi=hKNekX4_8RMm+OLvoPQahYHY-8iNm=ELFFPqS-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org
PATCH v3 1/1 cifs: Allow binding to local IP address.
Quoted 3 lines · Jeff Layton
On Tue, 31 Aug 2010 12:55:14 -0700
Ben Greear <greearb-my8/[email protected]> wrote:
<snip>
Quoted 8 lines
Quoted 5 lines
+ else
+ printk(KERN_WARNING "cifs: "
+ "Failed to bind to: %pI4, error: %d\n",
+ &saddr4->sin_addr.s_addr, rc);
+ }^^^^^^^^^^^
For better or worse, the CIFS code uses the cFYI and cERROR macros for printk's. You should probably do the same here.
This reminds me that as soon as we can figure out a good model/example of file system code using dynamic trace points (and where to store their definitions, presumably somewhere in the documentation area of the kernel source tree) we could consider replacing the cFYIs eventually (it will make debugging mount problems harder when we use dynamic trace points since we sometimes have to have users turn on cifsFYI to find out exactly which request a server is rejecting - and whether it is a server or client issue - but it will make the module smaller).
--
Thanks,
Steve
--
Thanks,
Steve
A message that is not in the archive (sent off-list or not yet received): 20100901084147.4aa66e9d-4QP7MXygkU+dMjc06nkz3ljfA9RmPOcC@public.gmane.org
Quoted 22 lines · Jeff Layton
Quoted 19 lines · On Tue, 31 Aug 2010 12:55:14 -0700 Ben Greear<greearb-my8/4N5VtI7c+919tysfdA@pu…
When using multi-homed machines, it's nice to be able to specify the local IP to use for outbound connections. This patch gives cifs the ability to bind to a particular IP address.
Usage: mount -t cifs -o srcaddr=192.168.1.50,user=foo, ... Usage: mount -t cifs -o srcaddr=2002::100:1,user=foo, ...Signed-off-by Ben Greear<greearb-my8/[email protected]>fs/cifs/cifsfs.c +10
-0+bool +cifs_addr_is_specified (struct sockaddr *srcaddr) { +struct sockaddr_in *saddr4 = (struct sockaddr_in *)srcaddr; +struct sockaddr_in6 *saddr6 = (struct sockaddr_in6 *)srcaddr; +static const struct in6_addr c_in6addr_any =IN6ADDR_ANY_INIT ; +switch (srcaddr->sa_family) { +case AF_INET : +return saddr4->sin_addr.s_addr !=0 ; +case AF_INET6 : +return (!ipv6_addr_equal (&c_in6addr_any,&saddr6->sin6_addr));
Quoted 8 lines
fs/cifs/cifsfs.c cifs_show_address(struct seq_file *s, struct TCP_Server_Info *server) · line 374
Quoted 4 lines
fs/cifs/cifsfs.c +4
-0+ } +return false; +} +I don't think you need all of this.
cifs_addr_is_specifiedought to just besrcaddr->sa_family!=AF_UNSPEC. That could be a static inline or macro, even.
Yeah, I'll fix that next patch.
Quoted 29 lines
Quoted 29 lines
fs/cifs/connect.c +29
-0+/** Returns true if srcaddr isn't specified and rhs isn't +* specified, or if srcaddr is specified and +* matches the IP address of the rhs argument. +*/ +static bool +srcip_matches (struct sockaddr *srcaddr,struct sockaddr *rhs) +{ +if (cifs_addr_is_specified (srcaddr)) { +struct sockaddr_in *saddr4 = (struct sockaddr_in *)srcaddr; +struct sockaddr_in6 *saddr6 = (struct sockaddr_in6 *)srcaddr; +struct sockaddr_in *vaddr4 = (struct sockaddr_in *)rhs; +struct sockaddr_in6 *vaddr6 = (struct sockaddr_in6 *)&rhs; + +switch (srcaddr->sa_family) { +case AF_INET : +if (saddr4->sin_addr.s_addr != vaddr4->sin_addr.s_addr) +return false; +break ; +case AF_INET6 : +if (!ipv6_addr_equal (&saddr6->sin6_addr, + &vaddr6->sin6_addr)) +return false; +break ; +default : +return false; + } +return true; + } +else
Quoted 8 lines
fs/cifs/connect.c cifs_parse_mount_options(char *options, const char *devname, · line 1443
Quoted 2 lines
fs/cifs/connect.c +2
-0+return !cifs_addr_is_specified (rhs); +}This is more complicated than it really needs to be I think. I think all what you really need to do here is check to see if the address families match. If they do and they're either
AF_INETflavor, then check to see if the addresses match. You might even be able to reuse some of the code inmatch_addresshere.
I think I'm basically doing what you suggest, with the only trick that any un-bound (non-specified) addresses must match only other non-specified connections.
Please post an improved version of this method if you have one to suggest, but I don't see any way to significantly simplify this.
Quoted 25 lines
Quoted 14 lines
fs/cifs/connect.c +14
-0+static int +bind_socket (struct TCP_Server_Info *server) +{ +int rc =0 ; +if (cifs_addr_is_specified ((struct sockaddr *)&server->srcaddr)) { +/* Bind to the local IP address if specified */ +struct socket *socket = server->ssocket; + rc = socket->ops->bind (socket, + (struct sockaddr *)&server->srcaddr, +sizeof (server->srcaddr)); +if (rc<0 ) { +struct sockaddr_in *saddr4; +struct sockaddr_in6 *saddr6; + saddr4 = (struct sockaddr_in *)&server->srcaddr;fs/cifs/connect.c static void rfc1002mangle(char *target, char *source, unsigned int length) · line 2110
Quoted 10 lines
fs/cifs/connect.c +10
-0+ saddr6 = (struct sockaddr_in6 *)&server->srcaddr; +if (saddr6->sin6_family ==AF_INET6 ) +printk (KERN_WARNING "cifs: " +"Failed to bind to: %pI6c, error: %d\n" , + &saddr6->sin6_addr, rc); +else +printk (KERN_WARNING "cifs: " +"Failed to bind to: %pI4, error: %d\n" , + &saddr4->sin_addr.s_addr, rc); + }^^^^^^^^^^^
Quoted 2 lines
For better or worse, the CIFS code uses the cFYI and cERROR macros for printk's. You should probably do the same here.
If I make these cERROR, will they be printed to /var/log/messages and/or dmesg by default if the error case hits? I definately want this visible in the logs by default so users have a chance of figuring out why the bind failed.
Quoted 3 lines
^^^^
The printk's are nice and all, but shouldn't you fail the ipv[4,6]_connect if the socket can't be bound?
Either way is fine with me. It would be possible for the actual connection to still work in the bind-failure case, but it might not be what the user would expect.
Thanks,
Ben
Signature · 2 lines
Ben Greear <greearb-my8/[email protected]> Candela Technologies Inc http://www.candelatech.com
A message that is not in the archive (sent off-list or not yet received): 4C7E7FDC.7060606-my8/[email protected]
Quoted 72 lines · On Wed, 01 Sep 2010 09:31:24 -0700 Ben Greear…
Quoted 22 lines · Jeff Layton
Quoted 19 lines · On Tue, 31 Aug 2010 12:55:14 -0700 Ben Greear<greearb-my8/4N5VtI7c+919tysfdA@pu…
When using multi-homed machines, it's nice to be able to specify the local IP to use for outbound connections. This patch gives cifs the ability to bind to a particular IP address.
Usage: mount -t cifs -o srcaddr=192.168.1.50,user=foo, ... Usage: mount -t cifs -o srcaddr=2002::100:1,user=foo, ...Signed-off-by Ben Greear<greearb-my8/[email protected]>fs/cifs/cifsfs.c +10
-0+bool +cifs_addr_is_specified (struct sockaddr *srcaddr) { +struct sockaddr_in *saddr4 = (struct sockaddr_in *)srcaddr; +struct sockaddr_in6 *saddr6 = (struct sockaddr_in6 *)srcaddr; +static const struct in6_addr c_in6addr_any =IN6ADDR_ANY_INIT ; +switch (srcaddr->sa_family) { +case AF_INET : +return saddr4->sin_addr.s_addr !=0 ; +case AF_INET6 : +return (!ipv6_addr_equal (&c_in6addr_any,&saddr6->sin6_addr));Quoted 8 lines
fs/cifs/cifsfs.c cifs_show_address(struct seq_file *s, struct TCP_Server_Info *server) · line 374
Quoted 4 lines
fs/cifs/cifsfs.c +4
-0+ } +return false; +} +I don't think you need all of this.
cifs_addr_is_specifiedought to just besrcaddr->sa_family!=AF_UNSPEC. That could be a static inline or macro, even.Yeah, I'll fix that next patch.
Quoted 29 lines
Quoted 29 lines
fs/cifs/connect.c +29
-0+/** Returns true if srcaddr isn't specified and rhs isn't +* specified, or if srcaddr is specified and +* matches the IP address of the rhs argument. +*/ +static bool +srcip_matches (struct sockaddr *srcaddr,struct sockaddr *rhs) +{ +if (cifs_addr_is_specified (srcaddr)) { +struct sockaddr_in *saddr4 = (struct sockaddr_in *)srcaddr; +struct sockaddr_in6 *saddr6 = (struct sockaddr_in6 *)srcaddr; +struct sockaddr_in *vaddr4 = (struct sockaddr_in *)rhs; +struct sockaddr_in6 *vaddr6 = (struct sockaddr_in6 *)&rhs; + +switch (srcaddr->sa_family) { +case AF_INET : +if (saddr4->sin_addr.s_addr != vaddr4->sin_addr.s_addr) +return false; +break ; +case AF_INET6 : +if (!ipv6_addr_equal (&saddr6->sin6_addr, + &vaddr6->sin6_addr)) +return false; +break ; +default : +return false; + } +return true; + } +else Quoted 8 lines
fs/cifs/connect.c cifs_parse_mount_options(char *options, const char *devname, · line 1443
Quoted 2 lines
fs/cifs/connect.c +2
-0+return !cifs_addr_is_specified (rhs); +}This is more complicated than it really needs to be I think. I think all what you really need to do here is check to see if the address families match. If they do and they're either
AF_INETflavor, then check to see if the addresses match. You might even be able to reuse some of the code inmatch_addresshere.
Quoted 7 lines
I think I'm basically doing what you suggest, with the only trick that any un-bound (non-specified) addresses must match only other non-specified connections.
Please post an improved version of this method if you have one to suggest, but I don't see any way to significantly simplify this.
In pseudocode...
switch(srcaddr->sa_family) {AF_UNSPEC:
if (rhs->sa_family == AF_UNSPEC) return true; AF_INET: /* compare v4 address, return true if same */ AF_INET6: /* compare v6 address, return true if same */ default: /* fall through */ }
return false;
Quoted 28 lines
Quoted 25 lines
Quoted 14 lines
fs/cifs/connect.c +14
-0+static int +bind_socket (struct TCP_Server_Info *server) +{ +int rc =0 ; +if (cifs_addr_is_specified ((struct sockaddr *)&server->srcaddr)) { +/* Bind to the local IP address if specified */ +struct socket *socket = server->ssocket; + rc = socket->ops->bind (socket, + (struct sockaddr *)&server->srcaddr, +sizeof (server->srcaddr)); +if (rc<0 ) { +struct sockaddr_in *saddr4; +struct sockaddr_in6 *saddr6; + saddr4 = (struct sockaddr_in *)&server->srcaddr;fs/cifs/connect.c static void rfc1002mangle(char *target, char *source, unsigned int length) · line 2110
Quoted 10 lines
fs/cifs/connect.c +10
-0+ saddr6 = (struct sockaddr_in6 *)&server->srcaddr; +if (saddr6->sin6_family ==AF_INET6 ) +printk (KERN_WARNING "cifs: " +"Failed to bind to: %pI6c, error: %d\n" , + &saddr6->sin6_addr, rc); +else +printk (KERN_WARNING "cifs: " +"Failed to bind to: %pI4, error: %d\n" , + &saddr4->sin_addr.s_addr, rc); + }^^^^^^^^^^^Quoted 2 lines
For better or worse, the CIFS code uses the cFYI and cERROR macros for printk's. You should probably do the same here.
Quoted 5 lines
If I make these cERROR, will they be printed to
/var/log/messagesand/or dmesg by default if the error case hits? I definately want this visible in the logs by default so users have a chance of figuring out why the bind failed.
They should -- those are both macros around printk.
I'd make it a cFYI macro and fail the mount if the bind fails. They can then crank up the debugging if they need to dig further.
Quoted 8 lines
Quoted 3 lines
^^^^
The printk's are nice and all, but shouldn't you fail the ipv[4,6]_connect if the socket can't be bound?Either way is fine with me. It would be possible for the actual connection to still work in the bind-failure case, but it might not be what the user would expect.
Sounds like reason enough to fail to mount. If they don't really care then they can remount without srcaddr=.
Signature · 1 line
Jeff Layton <[email protected]>
Quoted 10 lines · Ben Greear
Quoted 9 lines · Jeff Layton
Quoted 6 lines · On Tue, 31 Aug 2010 12:55:14 -0700 Ben Greear<greearb-my8/4N5VtI7c+919tysfdA@pu…
When using multi-homed machines, it's nice to be able to specify the local IP to use for outbound connections. This patch gives cifs the ability to bind to a particular IP address.
Usage: mount -t cifs -o srcaddr=192.168.1.50,user=foo, ... Usage: mount -t cifs -o srcaddr=2002::100:1,user=foo, ...
<snip>
Quoted 13 lines
Quoted 10 lines
fs/cifs/connect.c static void rfc1002mangle(char *target, char *source, unsigned int length) · line 2110
Quoted 9 lines
fs/cifs/connect.c +9
-0+if (saddr6->sin6_family ==AF_INET6 ) +printk (KERN_WARNING "cifs: " +"Failed to bind to: %pI6c, error: %d\n" , + &saddr6->sin6_addr, rc); +else +printk (KERN_WARNING "cifs: " +"Failed to bind to: %pI4, error: %d\n" , + &saddr4->sin_addr.s_addr, rc); + }^^^^^^^^^^^Quoted 2 lines
For better or worse, the CIFS code uses the cFYI and cERROR macros for printk's. You should probably do the same here.
Quoted 4 lines
If I make these cERROR, will they be printed to
/var/log/messagesand/or dmesg by default if the error case hits? I definately want this visible in the logs by default so users have a chance of figuring out why the bind failed.
Use cERROR if you want it to be logged always, cFYI if you only want it logged when cifs debugging is enabled at run time.
cFYI messages will not be logged unless /proc/fs/cifs/cifsFYI is set to 1 (it is a flag, CIFS_INFO, so setting cifsFYI to 3, 5, or 7 will also turn it on these log messages on. The other flags 0x02 is used to log entry/exit from cifs functions, and 0x04 for timing related logging of slow responses).
cERRORs will always be logged (although it could be changed via a debugger to disable it, users would not disable it)
Quoted 7 lines
Quoted 3 lines
^^^^
The printk's are nice and all, but shouldn't you fail the ipv[4,6]_connect if the socket can't be bound?Either way is fine with me. It would be possible for the actual connection to still work in the bind-failure case, but it might not be what the user would expect.
Signature · 3 lines
Thanks, Steve