mirror of
https://github.com/samba-team/samba.git
synced 2024-12-25 23:21:54 +03:00
894358a8f3
realloc can return NULL in one of two cases - (1) the realloc failed,
(2) realloc succeeded but the new size requested was zero, in which
case this is identical to a free() call.
The error paths dealing with these two cases should be different,
but mostly weren't. Secondly the standard idiom for dealing with
realloc when you know the new size is non-zero is the following :
tmp = realloc(p, size);
if (!tmp) {
SAFE_FREE(p);
return error;
} else {
p = tmp;
}
However, there were *many* *many* places in Samba where we were
using the old (broken) idiom of :
p = realloc(p, size)
if (!p) {
return error;
}
which will leak the memory pointed to by p on realloc fail.
This commit (hopefully) fixes all these cases by moving to
a standard idiom of :
p = SMB_REALLOC(p, size)
if (!p) {
return error;
}
Where if the realloc returns null due to the realloc failing
or size == 0 we *guarentee* that the storage pointed to by p
has been freed. This allows me to remove a lot of code that
was dealing with the standard (more verbose) method that required
a tmp pointer. This is almost always what you want. When a
realloc fails you never usually want the old memory, you
want to free it and get into your error processing asap.
For the 11 remaining cases where we really do need to keep the
old pointer I have invented the new macro SMB_REALLOC_KEEP_OLD_ON_ERROR,
which can be used as follows :
tmp = SMB_REALLOC_KEEP_OLD_ON_ERROR(p, size);
if (!tmp) {
SAFE_FREE(p);
return error;
} else {
p = tmp;
}
SMB_REALLOC_KEEP_OLD_ON_ERROR guarentees never to free the
pointer p, even on size == 0 or realloc fail. All this is
done by a hidden extra argument to Realloc(), BOOL free_old_on_error
which is set appropriately by the SMB_REALLOC and SMB_REALLOC_KEEP_OLD_ON_ERROR
macros (and their array counterparts).
It remains to be seen what this will do to our Coverity bug count :-).
Jeremy.
(This used to be commit 1d710d06a2)
262 lines
6.0 KiB
C
262 lines
6.0 KiB
C
/*
|
|
Samba Unix/Linux SMB client library
|
|
net status command -- possible replacement for smbstatus
|
|
Copyright (C) 2003 Volker Lendecke (vl@samba.org)
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
|
|
|
|
#include "includes.h"
|
|
#include "utils/net.h"
|
|
|
|
static int show_session(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf,
|
|
void *state)
|
|
{
|
|
BOOL *parseable = (BOOL *)state;
|
|
struct sessionid sessionid;
|
|
|
|
if (dbuf.dsize != sizeof(sessionid))
|
|
return 0;
|
|
|
|
memcpy(&sessionid, dbuf.dptr, sizeof(sessionid));
|
|
|
|
if (!process_exists_by_pid(sessionid.pid)) {
|
|
return 0;
|
|
}
|
|
|
|
if (*parseable) {
|
|
d_printf("%d\\%s\\%s\\%s\\%s\n",
|
|
(int)sessionid.pid, uidtoname(sessionid.uid),
|
|
gidtoname(sessionid.gid),
|
|
sessionid.remote_machine, sessionid.hostname);
|
|
} else {
|
|
d_printf("%5d %-12s %-12s %-12s (%s)\n",
|
|
(int)sessionid.pid, uidtoname(sessionid.uid),
|
|
gidtoname(sessionid.gid),
|
|
sessionid.remote_machine, sessionid.hostname);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int net_status_sessions(int argc, const char **argv)
|
|
{
|
|
TDB_CONTEXT *tdb;
|
|
BOOL parseable;
|
|
|
|
if (argc == 0) {
|
|
parseable = False;
|
|
} else if ((argc == 1) && strequal(argv[0], "parseable")) {
|
|
parseable = True;
|
|
} else {
|
|
return net_help_status(argc, argv);
|
|
}
|
|
|
|
if (!parseable) {
|
|
d_printf("PID Username Group Machine"
|
|
" \n");
|
|
d_printf("-------------------------------------------"
|
|
"------------------------\n");
|
|
}
|
|
|
|
tdb = tdb_open_log(lock_path("sessionid.tdb"), 0,
|
|
TDB_DEFAULT, O_RDONLY, 0);
|
|
|
|
if (tdb == NULL) {
|
|
d_fprintf(stderr, "%s not initialised\n", lock_path("sessionid.tdb"));
|
|
return -1;
|
|
}
|
|
|
|
tdb_traverse(tdb, show_session, &parseable);
|
|
tdb_close(tdb);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int show_share(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf,
|
|
void *state)
|
|
{
|
|
struct connections_data crec;
|
|
|
|
if (dbuf.dsize != sizeof(crec))
|
|
return 0;
|
|
|
|
memcpy(&crec, dbuf.dptr, sizeof(crec));
|
|
|
|
if (crec.cnum == -1)
|
|
return 0;
|
|
|
|
if (!process_exists(crec.pid)) {
|
|
return 0;
|
|
}
|
|
|
|
d_printf("%-10.10s %s %-12s %s",
|
|
crec.name,procid_str_static(&crec.pid),
|
|
crec.machine,
|
|
asctime(localtime(&crec.start)));
|
|
|
|
return 0;
|
|
}
|
|
|
|
struct sessionids {
|
|
int num_entries;
|
|
struct sessionid *entries;
|
|
};
|
|
|
|
static int collect_pid(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf,
|
|
void *state)
|
|
{
|
|
struct sessionids *ids = (struct sessionids *)state;
|
|
struct sessionid sessionid;
|
|
|
|
if (dbuf.dsize != sizeof(sessionid))
|
|
return 0;
|
|
|
|
memcpy(&sessionid, dbuf.dptr, sizeof(sessionid));
|
|
|
|
if (!process_exists_by_pid(sessionid.pid))
|
|
return 0;
|
|
|
|
ids->num_entries += 1;
|
|
ids->entries = SMB_REALLOC_ARRAY(ids->entries, struct sessionid, ids->num_entries);
|
|
if (!ids->entries) {
|
|
ids->num_entries = 0;
|
|
return 0;
|
|
}
|
|
ids->entries[ids->num_entries-1] = sessionid;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int show_share_parseable(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf,
|
|
void *state)
|
|
{
|
|
struct sessionids *ids = (struct sessionids *)state;
|
|
struct connections_data crec;
|
|
int i;
|
|
BOOL guest = True;
|
|
|
|
if (dbuf.dsize != sizeof(crec))
|
|
return 0;
|
|
|
|
memcpy(&crec, dbuf.dptr, sizeof(crec));
|
|
|
|
if (crec.cnum == -1)
|
|
return 0;
|
|
|
|
if (!process_exists(crec.pid)) {
|
|
return 0;
|
|
}
|
|
|
|
for (i=0; i<ids->num_entries; i++) {
|
|
struct process_id id = pid_to_procid(ids->entries[i].pid);
|
|
if (procid_equal(&id, &crec.pid)) {
|
|
guest = False;
|
|
break;
|
|
}
|
|
}
|
|
|
|
d_printf("%s\\%s\\%s\\%s\\%s\\%s\\%s",
|
|
crec.name,procid_str_static(&crec.pid),
|
|
guest ? "" : uidtoname(ids->entries[i].uid),
|
|
guest ? "" : gidtoname(ids->entries[i].gid),
|
|
crec.machine,
|
|
guest ? "" : ids->entries[i].hostname,
|
|
asctime(localtime(&crec.start)));
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int net_status_shares_parseable(int argc, const char **argv)
|
|
{
|
|
struct sessionids ids;
|
|
TDB_CONTEXT *tdb;
|
|
|
|
ids.num_entries = 0;
|
|
ids.entries = NULL;
|
|
|
|
tdb = tdb_open_log(lock_path("sessionid.tdb"), 0,
|
|
TDB_DEFAULT, O_RDONLY, 0);
|
|
|
|
if (tdb == NULL) {
|
|
d_fprintf(stderr, "%s not initialised\n", lock_path("sessionid.tdb"));
|
|
return -1;
|
|
}
|
|
|
|
tdb_traverse(tdb, collect_pid, &ids);
|
|
tdb_close(tdb);
|
|
|
|
tdb = tdb_open_log(lock_path("connections.tdb"), 0,
|
|
TDB_DEFAULT, O_RDONLY, 0);
|
|
|
|
if (tdb == NULL) {
|
|
d_fprintf(stderr, "%s not initialised\n", lock_path("connections.tdb"));
|
|
d_fprintf(stderr, "This is normal if no SMB client has ever "
|
|
"connected to your server.\n");
|
|
return -1;
|
|
}
|
|
|
|
tdb_traverse(tdb, show_share_parseable, &ids);
|
|
tdb_close(tdb);
|
|
|
|
SAFE_FREE(ids.entries);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int net_status_shares(int argc, const char **argv)
|
|
{
|
|
TDB_CONTEXT *tdb;
|
|
|
|
if (argc == 0) {
|
|
|
|
d_printf("\nService pid machine "
|
|
"Connected at\n");
|
|
d_printf("-------------------------------------"
|
|
"------------------\n");
|
|
|
|
tdb = tdb_open_log(lock_path("connections.tdb"), 0,
|
|
TDB_DEFAULT, O_RDONLY, 0);
|
|
|
|
if (tdb == NULL) {
|
|
d_fprintf(stderr, "%s not initialised\n",
|
|
lock_path("connections.tdb"));
|
|
d_fprintf(stderr, "This is normal if no SMB client has "
|
|
"ever connected to your server.\n");
|
|
return -1;
|
|
}
|
|
|
|
tdb_traverse(tdb, show_share, NULL);
|
|
tdb_close(tdb);
|
|
|
|
return 0;
|
|
}
|
|
|
|
if ((argc != 1) || !strequal(argv[0], "parseable")) {
|
|
return net_help_status(argc, argv);
|
|
}
|
|
|
|
return net_status_shares_parseable(argc, argv);
|
|
}
|
|
|
|
int net_status(int argc, const char **argv)
|
|
{
|
|
struct functable func[] = {
|
|
{"sessions", net_status_sessions},
|
|
{"shares", net_status_shares},
|
|
{NULL, NULL}
|
|
};
|
|
return net_run_function(argc, argv, func, net_help_status);
|
|
}
|