summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
75cbc8d)
client_init()'s current callers can now deal correctly with a failure.
Get rid of code that can cause our process to exit in client_init(),
if address mask parsing or memory allocation fails.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
#endif
static char *add_name(char *old, const char *add);
#endif
static char *add_name(char *old, const char *add);
-static void client_init(nfs_client *clp, const char *hname,
+static int client_init(nfs_client *clp, const char *hname,
struct hostent *hp);
nfs_client *clientlist[MCL_MAXTYPES] = { NULL, };
struct hostent *hp);
nfs_client *clientlist[MCL_MAXTYPES] = { NULL, };
clp = (nfs_client *) xmalloc(sizeof(*clp));
memset(clp, 0, sizeof(*clp));
clp->m_type = htype;
clp = (nfs_client *) xmalloc(sizeof(*clp));
memset(clp, 0, sizeof(*clp));
clp->m_type = htype;
- client_init(clp, hname, NULL);
+ if (!client_init(clp, hname, NULL)) {
+ client_free(clp);
+ clp = NULL;
+ goto out;
+ }
client_add(clp);
}
if (htype == MCL_FQDN && clp->m_naddr == 0)
init_addrlist(clp, hp);
client_add(clp);
}
if (htype == MCL_FQDN && clp->m_naddr == 0)
init_addrlist(clp, hp);
new->m_type = MCL_FQDN;
new->m_hostname = NULL;
new->m_type = MCL_FQDN;
new->m_hostname = NULL;
- client_init(new, (char *) hp->h_name, hp);
+ if (!client_init(new, hp->h_name, hp)) {
+ client_free(new);
+ return NULL;
+ }
client_add(new);
return new;
}
client_add(new);
return new;
}
client_init(nfs_client *clp, const char *hname, struct hostent *hp)
{
xfree(clp->m_hostname);
client_init(nfs_client *clp, const char *hname, struct hostent *hp)
{
xfree(clp->m_hostname);
htonl ((uint32_t) ~0 << (32 - netmask));
}
else {
htonl ((uint32_t) ~0 << (32 - netmask));
}
else {
- xlog(L_FATAL, "invalid netmask `%s' for %s",
- cp + 1, clp->m_hostname);
+ xlog(L_ERROR, "invalid netmask `%s' for %s",
+ cp + 1, clp->m_hostname);
+ return 0;
}
init_addrlist(clp, hp);
}
init_addrlist(clp, hp);