summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorIgor Mammedov <niallain@gmail.com>2008-05-20 13:02:01 +0400
committerSteve French <sfrench@us.ibm.com>2008-05-21 03:49:00 +0000
commit5651ced3ab196b5e7dc485c5777f210aa41e2d8d (patch)
tree9bc52a46726a6dcf7c4a7943ae092c7d56130e9a /fs
parentb9a3260f25ab5d2ba5c8b9508e7952848b9d704b (diff)
Fix possible access to undefined memory region.
Signed-off-by: Igor Mammedov <niallain@gmail.com> Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/cifs/dns_resolve.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/cifs/dns_resolve.c b/fs/cifs/dns_resolve.c
index 939e256f8497..f730ef35499e 100644
--- a/fs/cifs/dns_resolve.c
+++ b/fs/cifs/dns_resolve.c
@@ -134,10 +134,6 @@ dns_resolve_server_name_to_ip(const char *unc, char **ip_addr)
rkey = request_key(&key_type_dns_resolver, name, "");
if (!IS_ERR(rkey)) {
data = rkey->payload.data;
- cFYI(1, ("%s: resolved: %s to %s", __func__,
- rkey->description,
- *ip_addr
- ));
} else {
cERROR(1, ("%s: unable to resolve: %s", __func__, name));
goto out;
@@ -150,6 +146,11 @@ skip_upcall:
if (*ip_addr) {
memcpy(*ip_addr, data, len);
(*ip_addr)[len] = '\0';
+ if (!IS_ERR(rkey))
+ cFYI(1, ("%s: resolved: %s to %s", __func__,
+ name,
+ *ip_addr
+ ));
rc = 0;
} else {
rc = -ENOMEM;