I'm about to replace inet_aton(3)/gethostbyaddr(3) with
host_pton()/host_canonname() in mountlist_list().
Since host_canonname() returns a string allocated with strdup(3)
instead of xstrdup(), mountlist_list() must now deal with memory
exhaustion properly.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <netdb.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <netdb.h>
#include "misc.h"
#include "exportfs.h"
#include "xio.h"
#include "misc.h"
#include "exportfs.h"
#include "xio.h"
while (list != NULL) {
mountlist m = list;
list = m->ml_next;
while (list != NULL) {
mountlist m = list;
list = m->ml_next;
- xfree(m->ml_hostname);
- xfree(m->ml_directory);
- xfree(m);
+ free(m->ml_hostname);
+ free(m->ml_directory);
+ free(m);
setrmtabent("r");
while ((rep = getrmtabent(1, NULL)) != NULL) {
setrmtabent("r");
while ((rep = getrmtabent(1, NULL)) != NULL) {
- m = (mountlist) xmalloc(sizeof(*m));
+ m = calloc(1, sizeof(*m));
+ if (m == NULL) {
+ mountlist_freeall(mlist);
+ mlist = NULL;
+ xlog(L_ERROR, "%s: memory allocation failed",
+ __func__);
+ break;
+ }
if (reverse_resolve &&
inet_aton((const char *) rep->r_client, &addr) &&
(he = gethostbyaddr(&addr, sizeof(addr), AF_INET)))
if (reverse_resolve &&
inet_aton((const char *) rep->r_client, &addr) &&
(he = gethostbyaddr(&addr, sizeof(addr), AF_INET)))
- m->ml_hostname = xstrdup(he->h_name);
+ m->ml_hostname = strdup(he->h_name);
- m->ml_hostname = xstrdup(rep->r_client);
+ m->ml_hostname = strdup(rep->r_client);
+
+ m->ml_directory = strdup(rep->r_path);
+
+ if (m->ml_hostname == NULL || m->ml_directory == NULL) {
+ mountlist_freeall(mlist);
+ mlist = NULL;
+ xlog(L_ERROR, "%s: memory allocation failed",
+ __func__);
+ break;
+ }
- m->ml_directory = xstrdup(rep->r_path);
m->ml_next = mlist;
mlist = m;
}
m->ml_next = mlist;
mlist = m;
}