diff options
author | David Howells <dhowells@redhat.com> | 2010-07-22 13:33:01 -0400 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2010-08-05 13:17:50 -0400 |
commit | 67b7626a0512d12e34b38ff45e32c693cf9c79a1 (patch) | |
tree | b62f4274a09d0e7ceee6325c077f487c2bceca3b /fs/cifs | |
parent | f579903ef3e392251dc7e93cb521ddb622fbf8e0 (diff) |
CIFS: Make cifs_convert_address() take a const src pointer and a length
Make cifs_convert_address() take a const src pointer and a length so that all
the strlen() calls in their can be cut out and to make it unnecessary to modify
the src string.
Also return the data length from dns_resolve_server_name_to_ip() so that a
strlen() can be cut out of cifs_compose_mount_options() too.
Acked-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs')
-rw-r--r-- | fs/cifs/cifs_dfs_ref.c | 5 | ||||
-rw-r--r-- | fs/cifs/cifsproto.h | 4 | ||||
-rw-r--r-- | fs/cifs/connect.c | 1 | ||||
-rw-r--r-- | fs/cifs/dns_resolve.c | 20 | ||||
-rw-r--r-- | fs/cifs/netmisc.c | 45 |
5 files changed, 38 insertions, 37 deletions
diff --git a/fs/cifs/cifs_dfs_ref.c b/fs/cifs/cifs_dfs_ref.c index dc1ed50ea06e..d6ced7aa23cf 100644 --- a/fs/cifs/cifs_dfs_ref.c +++ b/fs/cifs/cifs_dfs_ref.c | |||
@@ -141,7 +141,7 @@ char *cifs_compose_mount_options(const char *sb_mountdata, | |||
141 | } | 141 | } |
142 | 142 | ||
143 | rc = dns_resolve_server_name_to_ip(*devname, &srvIP); | 143 | rc = dns_resolve_server_name_to_ip(*devname, &srvIP); |
144 | if (rc != 0) { | 144 | if (rc < 0) { |
145 | cERROR(1, "%s: Failed to resolve server part of %s to IP: %d", | 145 | cERROR(1, "%s: Failed to resolve server part of %s to IP: %d", |
146 | __func__, *devname, rc); | 146 | __func__, *devname, rc); |
147 | goto compose_mount_options_err; | 147 | goto compose_mount_options_err; |
@@ -150,8 +150,7 @@ char *cifs_compose_mount_options(const char *sb_mountdata, | |||
150 | * assuming that we have 'unc=' and 'ip=' in | 150 | * assuming that we have 'unc=' and 'ip=' in |
151 | * the original sb_mountdata | 151 | * the original sb_mountdata |
152 | */ | 152 | */ |
153 | md_len = strlen(sb_mountdata) + strlen(srvIP) + | 153 | md_len = strlen(sb_mountdata) + rc + strlen(ref->node_name) + 12; |
154 | strlen(ref->node_name) + 12; | ||
155 | mountdata = kzalloc(md_len+1, GFP_KERNEL); | 154 | mountdata = kzalloc(md_len+1, GFP_KERNEL); |
156 | if (mountdata == NULL) { | 155 | if (mountdata == NULL) { |
157 | rc = -ENOMEM; | 156 | rc = -ENOMEM; |
diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h index 2eaebbd31132..1f5450814087 100644 --- a/fs/cifs/cifsproto.h +++ b/fs/cifs/cifsproto.h | |||
@@ -86,8 +86,8 @@ extern unsigned int smbCalcSize(struct smb_hdr *ptr); | |||
86 | extern unsigned int smbCalcSize_LE(struct smb_hdr *ptr); | 86 | extern unsigned int smbCalcSize_LE(struct smb_hdr *ptr); |
87 | extern int decode_negTokenInit(unsigned char *security_blob, int length, | 87 | extern int decode_negTokenInit(unsigned char *security_blob, int length, |
88 | struct TCP_Server_Info *server); | 88 | struct TCP_Server_Info *server); |
89 | extern int cifs_convert_address(struct sockaddr *dst, char *src); | 89 | extern int cifs_convert_address(struct sockaddr *dst, const char *src, int len); |
90 | extern int cifs_fill_sockaddr(struct sockaddr *dst, char *src, | 90 | extern int cifs_fill_sockaddr(struct sockaddr *dst, const char *src, int len, |
91 | unsigned short int port); | 91 | unsigned short int port); |
92 | extern int map_smb_to_linux_error(struct smb_hdr *smb, int logErr); | 92 | extern int map_smb_to_linux_error(struct smb_hdr *smb, int logErr); |
93 | extern void header_assemble(struct smb_hdr *, char /* command */ , | 93 | extern void header_assemble(struct smb_hdr *, char /* command */ , |
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 2a43a0aca965..95c2ea67edfb 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c | |||
@@ -1543,6 +1543,7 @@ cifs_get_tcp_session(struct smb_vol *volume_info) | |||
1543 | if (volume_info->UNCip && volume_info->UNC) { | 1543 | if (volume_info->UNCip && volume_info->UNC) { |
1544 | rc = cifs_fill_sockaddr((struct sockaddr *)&addr, | 1544 | rc = cifs_fill_sockaddr((struct sockaddr *)&addr, |
1545 | volume_info->UNCip, | 1545 | volume_info->UNCip, |
1546 | strlen(volume_info->UNCip), | ||
1546 | volume_info->port); | 1547 | volume_info->port); |
1547 | if (!rc) { | 1548 | if (!rc) { |
1548 | /* we failed translating address */ | 1549 | /* we failed translating address */ |
diff --git a/fs/cifs/dns_resolve.c b/fs/cifs/dns_resolve.c index 3ad7f4300c45..aa967e7917f8 100644 --- a/fs/cifs/dns_resolve.c +++ b/fs/cifs/dns_resolve.c | |||
@@ -40,11 +40,11 @@ static const struct cred *dns_resolver_cache; | |||
40 | * 0 - name is not IP | 40 | * 0 - name is not IP |
41 | */ | 41 | */ |
42 | static int | 42 | static int |
43 | is_ip(char *name) | 43 | is_ip(const char *name, int len) |
44 | { | 44 | { |
45 | struct sockaddr_storage ss; | 45 | struct sockaddr_storage ss; |
46 | 46 | ||
47 | return cifs_convert_address((struct sockaddr *)&ss, name); | 47 | return cifs_convert_address((struct sockaddr *)&ss, name, len); |
48 | } | 48 | } |
49 | 49 | ||
50 | static int | 50 | static int |
@@ -54,6 +54,10 @@ dns_resolver_instantiate(struct key *key, const void *data, | |||
54 | int rc = 0; | 54 | int rc = 0; |
55 | char *ip; | 55 | char *ip; |
56 | 56 | ||
57 | /* make sure this looks like an address */ | ||
58 | if (!is_ip(data, datalen)) | ||
59 | return -EINVAL; | ||
60 | |||
57 | ip = kmalloc(datalen + 1, GFP_KERNEL); | 61 | ip = kmalloc(datalen + 1, GFP_KERNEL); |
58 | if (!ip) | 62 | if (!ip) |
59 | return -ENOMEM; | 63 | return -ENOMEM; |
@@ -61,12 +65,6 @@ dns_resolver_instantiate(struct key *key, const void *data, | |||
61 | memcpy(ip, data, datalen); | 65 | memcpy(ip, data, datalen); |
62 | ip[datalen] = '\0'; | 66 | ip[datalen] = '\0'; |
63 | 67 | ||
64 | /* make sure this looks like an address */ | ||
65 | if (!is_ip(ip)) { | ||
66 | kfree(ip); | ||
67 | return -EINVAL; | ||
68 | } | ||
69 | |||
70 | key->type_data.x[0] = datalen; | 68 | key->type_data.x[0] = datalen; |
71 | key->payload.data = ip; | 69 | key->payload.data = ip; |
72 | 70 | ||
@@ -93,7 +91,7 @@ struct key_type key_type_dns_resolver = { | |||
93 | * unc - server UNC | 91 | * unc - server UNC |
94 | * output: | 92 | * output: |
95 | * *ip_addr - pointer to server ip, caller responcible for freeing it. | 93 | * *ip_addr - pointer to server ip, caller responcible for freeing it. |
96 | * return 0 on success | 94 | * return the length of the returned string on success |
97 | */ | 95 | */ |
98 | int | 96 | int |
99 | dns_resolve_server_name_to_ip(const char *unc, char **ip_addr) | 97 | dns_resolve_server_name_to_ip(const char *unc, char **ip_addr) |
@@ -131,7 +129,7 @@ dns_resolve_server_name_to_ip(const char *unc, char **ip_addr) | |||
131 | memcpy(name, unc+2, len); | 129 | memcpy(name, unc+2, len); |
132 | name[len] = 0; | 130 | name[len] = 0; |
133 | 131 | ||
134 | if (is_ip(name)) { | 132 | if (is_ip(name, len)) { |
135 | cFYI(1, "%s: it is IP, skipping dns upcall: %s", | 133 | cFYI(1, "%s: it is IP, skipping dns upcall: %s", |
136 | __func__, name); | 134 | __func__, name); |
137 | data = name; | 135 | data = name; |
@@ -164,7 +162,7 @@ skip_upcall: | |||
164 | name, | 162 | name, |
165 | *ip_addr | 163 | *ip_addr |
166 | ); | 164 | ); |
167 | rc = 0; | 165 | rc = len; |
168 | } else { | 166 | } else { |
169 | rc = -ENOMEM; | 167 | rc = -ENOMEM; |
170 | } | 168 | } |
diff --git a/fs/cifs/netmisc.c b/fs/cifs/netmisc.c index c6721ee26dbc..f97851119e6c 100644 --- a/fs/cifs/netmisc.c +++ b/fs/cifs/netmisc.c | |||
@@ -140,17 +140,18 @@ static const struct smb_to_posix_error mapping_table_ERRHRD[] = { | |||
140 | * Returns 0 on failure. | 140 | * Returns 0 on failure. |
141 | */ | 141 | */ |
142 | static int | 142 | static int |
143 | cifs_inet_pton(const int address_family, const char *cp, void *dst) | 143 | cifs_inet_pton(const int address_family, const char *cp, int len, void *dst) |
144 | { | 144 | { |
145 | int ret = 0; | 145 | int ret = 0; |
146 | 146 | ||
147 | /* calculate length by finding first slash or NULL */ | 147 | /* calculate length by finding first slash or NULL */ |
148 | if (address_family == AF_INET) | 148 | if (address_family == AF_INET) |
149 | ret = in4_pton(cp, -1 /* len */, dst, '\\', NULL); | 149 | ret = in4_pton(cp, len, dst, '\\', NULL); |
150 | else if (address_family == AF_INET6) | 150 | else if (address_family == AF_INET6) |
151 | ret = in6_pton(cp, -1 /* len */, dst , '\\', NULL); | 151 | ret = in6_pton(cp, len, dst , '\\', NULL); |
152 | 152 | ||
153 | cFYI(DBG2, "address conversion returned %d for %s", ret, cp); | 153 | cFYI(DBG2, "address conversion returned %d for %*.*s", |
154 | ret, len, len, cp); | ||
154 | if (ret > 0) | 155 | if (ret > 0) |
155 | ret = 1; | 156 | ret = 1; |
156 | return ret; | 157 | return ret; |
@@ -165,37 +166,39 @@ cifs_inet_pton(const int address_family, const char *cp, void *dst) | |||
165 | * Returns 0 on failure. | 166 | * Returns 0 on failure. |
166 | */ | 167 | */ |
167 | int | 168 | int |
168 | cifs_convert_address(struct sockaddr *dst, char *src) | 169 | cifs_convert_address(struct sockaddr *dst, const char *src, int len) |
169 | { | 170 | { |
170 | int rc; | 171 | int rc, alen, slen; |
171 | char *pct, *endp; | 172 | const char *pct; |
173 | char *endp, scope_id[13]; | ||
172 | struct sockaddr_in *s4 = (struct sockaddr_in *) dst; | 174 | struct sockaddr_in *s4 = (struct sockaddr_in *) dst; |
173 | struct sockaddr_in6 *s6 = (struct sockaddr_in6 *) dst; | 175 | struct sockaddr_in6 *s6 = (struct sockaddr_in6 *) dst; |
174 | 176 | ||
175 | /* IPv4 address */ | 177 | /* IPv4 address */ |
176 | if (cifs_inet_pton(AF_INET, src, &s4->sin_addr.s_addr)) { | 178 | if (cifs_inet_pton(AF_INET, src, len, &s4->sin_addr.s_addr)) { |
177 | s4->sin_family = AF_INET; | 179 | s4->sin_family = AF_INET; |
178 | return 1; | 180 | return 1; |
179 | } | 181 | } |
180 | 182 | ||
181 | /* temporarily terminate string */ | 183 | /* attempt to exclude the scope ID from the address part */ |
182 | pct = strchr(src, '%'); | 184 | pct = memchr(src, '%', len); |
183 | if (pct) | 185 | alen = pct ? pct - src : len; |
184 | *pct = '\0'; | ||
185 | |||
186 | rc = cifs_inet_pton(AF_INET6, src, &s6->sin6_addr.s6_addr); | ||
187 | |||
188 | /* repair temp termination (if any) and make pct point to scopeid */ | ||
189 | if (pct) | ||
190 | *pct++ = '%'; | ||
191 | 186 | ||
187 | rc = cifs_inet_pton(AF_INET6, src, alen, &s6->sin6_addr.s6_addr); | ||
192 | if (!rc) | 188 | if (!rc) |
193 | return rc; | 189 | return rc; |
194 | 190 | ||
195 | s6->sin6_family = AF_INET6; | 191 | s6->sin6_family = AF_INET6; |
196 | if (pct) { | 192 | if (pct) { |
193 | /* grab the scope ID */ | ||
194 | slen = len - (alen + 1); | ||
195 | if (slen <= 0 || slen > 12) | ||
196 | return 0; | ||
197 | memcpy(scope_id, pct + 1, slen); | ||
198 | scope_id[slen] = '\0'; | ||
199 | |||
197 | s6->sin6_scope_id = (u32) simple_strtoul(pct, &endp, 0); | 200 | s6->sin6_scope_id = (u32) simple_strtoul(pct, &endp, 0); |
198 | if (!*pct || *endp) | 201 | if (endp != scope_id + slen) |
199 | return 0; | 202 | return 0; |
200 | } | 203 | } |
201 | 204 | ||
@@ -203,10 +206,10 @@ cifs_convert_address(struct sockaddr *dst, char *src) | |||
203 | } | 206 | } |
204 | 207 | ||
205 | int | 208 | int |
206 | cifs_fill_sockaddr(struct sockaddr *dst, char *src, | 209 | cifs_fill_sockaddr(struct sockaddr *dst, const char *src, int len, |
207 | const unsigned short int port) | 210 | const unsigned short int port) |
208 | { | 211 | { |
209 | if (!cifs_convert_address(dst, src)) | 212 | if (!cifs_convert_address(dst, src, len)) |
210 | return 0; | 213 | return 0; |
211 | 214 | ||
212 | switch (dst->sa_family) { | 215 | switch (dst->sa_family) { |