Attachment #5481 for bug #8993

View | Details | Raw Unified | Return to bug 8993
Collapse All | Expand All

(-)b/clamd/clamd.c (-1 / +1 lines)

Lines 275-281 int main(int argc, char **argv)	Link Here

275

276

#ifdef C_LINUX

276

#ifdef C_LINUX

277

    procdev = 0;

277

    procdev = 0;

278

    if(STAT("/proc", &sb) != -1 && !sb.st_size)

278

    if(CLAMSTAT("/proc", &sb) != -1 && !sb.st_size)

279

	procdev = sb.st_dev;

279

	procdev = sb.st_dev;

280

#endif

280

#endif

281

(-)b/clamd/localserver.c (-1 / +1 lines)

Lines 92-98 int localserver(const struct optstruct *opts)	Link Here

		    close(sockfd);

		    close(sockfd);

		    return -1;

		    return -1;

	    } else if(STAT(server.sun_path, &foo) != -1) {

	    } else if(CLAMSTAT(server.sun_path, &foo) != -1) {

		logg("!LOCAL: Socket file %s exists. Either remove it, or configure a different one.\n", server.sun_path);

		logg("!LOCAL: Socket file %s exists. Either remove it, or configure a different one.\n", server.sun_path);

		close(sockfd);

		close(sockfd);

		return -1;

		return -1;

(-)b/clamd/others.c (-1 / +1 lines)

Lines 876-882 fan_checkowner (int pid, const struct optstruct *opts)	Link Here

876

        return 0;

876

        return 0;

877

878

    snprintf (path, sizeof (path), "/proc/%u", pid);

878

    snprintf (path, sizeof (path), "/proc/%u", pid);

879

    if (STAT (path, &sb) == 0)

879

    if (CLAMSTAT (path, &sb) == 0)

880

881

        while (opt)

881

        while (opt)

882

(-)b/clamd/scanner.c (-1 / +1 lines)

Lines 325-331 int scan_pathchk(const char path, struct cli_ftw_cbdata data)	Link Here

325

326

327

    if(!optget(scandata->opts, "CrossFilesystems")->enabled) {

327

    if(!optget(scandata->opts, "CrossFilesystems")->enabled) {

328

	if(STAT(path, &statbuf) == 0) {

328

	if(CLAMSTAT(path, &statbuf) == 0) {

329

	    if(statbuf.st_dev != scandata->dev) {

329

	    if(statbuf.st_dev != scandata->dev) {

330

		if(scandata->type != TYPE_MULTISCAN)

330

		if(scandata->type != TYPE_MULTISCAN)

331

		    conn_reply_single(scandata->conn, path, "Excluded (another filesystem)");

331

		    conn_reply_single(scandata->conn, path, "Excluded (another filesystem)");

(-)b/clamd/session.c (-2 / +2 lines)

Lines 236-242 int command(client_conn_t conn, int virus)	Link Here

236

	    int multiscan, max, alive;

236

	    int multiscan, max, alive;

237

238

	    /* use MULTISCAN only for directories (bb #1869) */

238

	    /* use MULTISCAN only for directories (bb #1869) */

239

	    if (STAT(conn->filename, &sb) == 0 &&

239

	    if (CLAMSTAT(conn->filename, &sb) == 0 &&

240

		!S_ISDIR(sb.st_mode)) {

240

		!S_ISDIR(sb.st_mode)) {

241

		thrmgr_setactivetask(NULL, "CONTSCAN");

241

		thrmgr_setactivetask(NULL, "CONTSCAN");

242

		type = TYPE_CONTSCAN;

242

		type = TYPE_CONTSCAN;

Lines 384-390 int command(client_conn_t conn, int virus)	Link Here

384

	 flags |= CLI_FTW_FOLLOW_FILE_SYMLINK;

384

	 flags |= CLI_FTW_FOLLOW_FILE_SYMLINK;

385

386

     if(!optget(opts, "CrossFilesystems")->enabled)

386

     if(!optget(opts, "CrossFilesystems")->enabled)

387

	 if(STAT(conn->filename, &sb) == 0)

387

	 if(CLAMSTAT(conn->filename, &sb) == 0)

388

	     scandata.dev = sb.st_dev;

388

	     scandata.dev = sb.st_dev;

389

390

     ret = cli_ftw(conn->filename, flags,  maxdirrec ? maxdirrec : INT_MAX, scan_callback, &data, scan_pathchk);

390

     ret = cli_ftw(conn->filename, flags,  maxdirrec ? maxdirrec : INT_MAX, scan_callback, &data, scan_pathchk);

(-)b/clamdscan/proto.c (-1 / +1 lines)

Lines 296-302 int dsresult(int sockd, int scantype, const char filename, int printok, int *e	Link Here

296

	    logg("STDIN: noreply from clamd\n.");

296

	    logg("STDIN: noreply from clamd\n.");

297

	    return -1;

297

	    return -1;

298

299

        if(STAT(filename, &sb) == -1) {

299

        if(CLAMSTAT(filename, &sb) == -1) {

300

	    logg("~%s: stat() failed with %s, clamd may not be responding\n",

300

	    logg("~%s: stat() failed with %s, clamd may not be responding\n",

301

		 filename, strerror(errno));

301

		 filename, strerror(errno));

302

	    return -1;

302

	    return -1;




    }

    /* argh, don't scan /proc files */
    if(CLAMSTAT(filename, &sb) != -1) {
#ifdef C_LINUX
	if(procdev && sb.st_dev == procdev) {
	    if(!printinfected)

			    if(dirlnk != 2 && filelnk != 2) {
				if(!printinfected)
				    logg("%s: Symbolic link\n", fname);
			    } else if(CLAMSTAT(fname, &sb) != -1) {
				if(S_ISREG(sb.st_mode) && filelnk == 2) {
				    scanfile(fname, engine, opts, options);
				} else if(S_ISDIR(sb.st_mode) && dirlnk == 2) {


#ifdef C_LINUX
    procdev = (dev_t) 0;
    if(CLAMSTAT("/proc", &sb) != -1 && !sb.st_size)
	procdev = sb.st_dev;
#endif


	    logg("!Can't get absolute pathname of current working directory\n");
	    ret = 2;
	} else {
	    CLAMSTAT(cwd, &sb);
	    scandirs(cwd, engine, opts, options, 1, sb.st_dev);
	}


		    if(dirlnk == 0 && filelnk == 0) {
			if(!printinfected)
			    logg("%s: Symbolic link\n", file);
		    } else if(CLAMSTAT(file, &sb) != -1) {
			if(S_ISREG(sb.st_mode) && filelnk) {
			    scanfile(file, engine, opts, options);
			} else if(S_ISDIR(sb.st_mode) && dirlnk) {

(-)b/freshclam/freshclam.c (-1 / +1 lines)

Lines 333-339 main (int argc, char **argv)	Link Here

333

334

    if (optget (opts, "HTTPProxyPassword")->enabled)

334

    if (optget (opts, "HTTPProxyPassword")->enabled)

335

336

        if (STAT (cfgfile, &statbuf) == -1)

336

        if (CLAMSTAT (cfgfile, &statbuf) == -1)

337

338

            logg ("^Can't stat %s (critical error)\n", cfgfile);

338

            logg ("^Can't stat %s (critical error)\n", cfgfile);

339

            optfree (opts);

339

            optfree (opts);

(-)b/freshclam/manager.c (-1 / +1 lines)

Lines 2621-2627 updatecustomdb (const char url, int signo, const struct optstruct *opts,	Link Here

2621

        rtimeout = optget (opts, "ReceiveTimeout")->numarg;

2621

        rtimeout = optget (opts, "ReceiveTimeout")->numarg;

2622

2623

        *mtime = 0;

2623

        *mtime = 0;

2624

        if (STAT (dbname, &sb) != -1)

2624

        if (CLAMSTAT (dbname, &sb) != -1)

2625

            Rfc2822DateTime (mtime, sb.st_mtime);

2625

            Rfc2822DateTime (mtime, sb.st_mtime);

2626

2627

        newfile = cli_gentemp (updtmpdir);

2627

        newfile = cli_gentemp (updtmpdir);




#include <unistd.h>

#define STATBUF struct stat64
#define CLAMSTAT stat64
#define LSTAT lstat64
#define FSTAT fstat64
#define safe_open(a, b) open(a, b|O_LARGEFILE)
#else

#define STATBUF struct stat
#define CLAMSTAT stat
#define LSTAT lstat
#define FSTAT fstat
/* Nothing is safe in windows, not even open, safe_open defined under /win32 */

(-)b/libclamav/mbox.c (-1 / +1 lines)

Lines 2813-2819 rfc1341(message m, const char dir)	Link Here

2813

	} else if(errno == EEXIST) {

2813

	} else if(errno == EEXIST) {

2814

		STATBUF statb;

2814

		STATBUF statb;

2815

2816

		if(STAT(pdir, &statb) < 0) {

2816

		if(CLAMSTAT(pdir, &statb) < 0) {

2817

			char err[128];

2817

			char err[128];

2818

			cli_errmsg("Partial directory %s: %s\n", pdir,

2818

			cli_errmsg("Partial directory %s: %s\n", pdir,

2819

				cli_strerror(errno, err, sizeof(err)));

2819

				cli_strerror(errno, err, sizeof(err)));

(-)b/libclamav/others.c (-2 / +2 lines)

Lines 903-909 cli_rmdirs(const char *name)	Link Here

903

	char err[128];

903

	char err[128];

904

905

906

    if(STAT(name, &statb) < 0) {

906

    if(CLAMSTAT(name, &statb) < 0) {

907

	cli_warnmsg("cli_rmdirs: Can't locate %s: %s\n", name, cli_strerror(errno, err, sizeof(err)));

907

	cli_warnmsg("cli_rmdirs: Can't locate %s: %s\n", name, cli_strerror(errno, err, sizeof(err)));

908

	return -1;

908

	return -1;

909

Lines 974-980 int cli_rmdirs(const char *dirname)	Link Here

974

975

    chmod(dirname, 0700);

975

    chmod(dirname, 0700);

976

    if((dd = opendir(dirname)) != NULL) {

976

    if((dd = opendir(dirname)) != NULL) {

977

	while(STAT(dirname, &maind) != -1) {

977

	while(CLAMSTAT(dirname, &maind) != -1) {

978

	    if(!rmdir(dirname)) break;

978

	    if(!rmdir(dirname)) break;

979

	    if(errno != ENOTEMPTY && errno != EEXIST && errno != EBADF) {

979

	    if(errno != ENOTEMPTY && errno != EEXIST && errno != EBADF) {

980

		cli_errmsg("cli_rmdirs: Can't remove temporary directory %s: %s\n", dirname, cli_strerror(errno, err, sizeof(err)));

980

		cli_errmsg("cli_rmdirs: Can't remove temporary directory %s: %s\n", dirname, cli_strerror(errno, err, sizeof(err)));

(-)b/libclamav/others_common.c (-1 / +1 lines)

Lines 520-526 static int get_filetype(const char *fname, int flags, int need_stat,	Link Here

520

521

522

    if (need_stat) {

522

    if (need_stat) {

523

	if (STAT(fname, statbuf) == -1)

523

	if (CLAMSTAT(fname, statbuf) == -1)

524

	    return -1;

524

	    return -1;

525

	stated = 1;

525

	stated = 1;

526




	return CL_EARG;
    }

    if(CLAMSTAT(path, &sb) == -1) {
        cli_errmsg("cl_load(): Can't get status of %s\n", path);
        return CL_ESTAT;
    }


		strcpy(dbstat->statdname[dbstat->entries - 1], dent->d_name);
#endif
		CLAMSTAT(fname, &dbstat->stattab[dbstat->entries - 1]);
		free(fname);
	    }
	}

		}

		sprintf(fname, "%s"PATHSEP"%s", dbstat->dir, dent->d_name);
		CLAMSTAT(fname, &sb);
		free(fname);

		found = 0;

    if(!sigs)
	return CL_ENULLARG;

    if(CLAMSTAT(path, &sb) == -1) {
	cli_errmsg("cl_countsigs: Can't stat %s\n", path);
	return CL_ESTAT;
    }

(-)b/shared/actions.c (-1 / +1 lines)

Lines 123-129 static void action_remove(const char *filename) {	Link Here

123

124

static int isdir(void) {

124

static int isdir(void) {

125

    STATBUF sb;

125

    STATBUF sb;

126

    if(STAT(actarget, &sb) || !S_ISDIR(sb.st_mode)) {

126

    if(CLAMSTAT(actarget, &sb) || !S_ISDIR(sb.st_mode)) {

127

	logg("!'%s' doesn't exist or is not a directory\n", actarget);

127

	logg("!'%s' doesn't exist or is not a directory\n", actarget);

128

	return 0;

128

	return 0;

129

(-)b/shared/output.c (-1 / +1 lines)

Lines 261-267 static int logg_open(void)	Link Here

261

262

    if(logg_file)

262

    if(logg_file)

263

        if(logg_size > 0)

263

        if(logg_size > 0)

264

            if(STAT(logg_file, &sb) != -1)

264

            if(CLAMSTAT(logg_file, &sb) != -1)

265

                if(sb.st_size > logg_size)

265

                if(sb.st_size > logg_size)

266

	                if (rename_logg(&sb))

266

	                if (rename_logg(&sb))

267

                        return -1;

267

                        return -1;





    if(opts->filename) {
	for(i = 0; opts->filename[i]; i++) {
	    if(CLAMSTAT(opts->filename[i], &sb) == -1) {
		mprintf("!hashsig: Can't access file %s\n", opts->filename[i]);
		perror("hashsig");
		return -1;

	int bytes;


    if(CLAMSTAT(script, &sb) == -1) {
	mprintf("!script2diff: Can't stat file %s\n", script);
	return -1;
    }

    if(optget(opts, "datadir")->active)
	localdbdir = optget(opts, "datadir")->strarg;

    if(CLAMSTAT("COPYING", &foo) == -1) {
	mprintf("!build: COPYING file not found in current working directory.\n");
	return -1;
    }

	name = optget(opts, "list-sigs")->strarg;
	if(access(name, R_OK) && localdbdir)
	    name = localdbdir;
	if(CLAMSTAT(name, &sb) == -1) {
	    mprintf("--list-sigs: Can't get status of %s\n", name);
	    return -1;
	}

	char spath[512], dpath[512];


    if(CLAMSTAT(dest, &sb) == -1) {
	if(mkdir(dest, 0755)) {
	    /* mprintf("!dircopy: Can't create temporary directory %s\n", dest); */
	    return -1;

	    mprintf("!--verify-cdiff requires two arguments\n");
	    ret = -1;
	} else {
	    if(CLAMSTAT(opts->filename[0], &sb) == -1) {
		mprintf("--verify-cdiff: Can't get status of %s\n", opts->filename[0]);
		ret = -1;
	    } else {

(-)b/unit_tests/check_clamd.c (-1 / +1 lines)

Lines 350-356 static size_t prepare_instream(char *buf, size_t off, size_t buflen)	Link Here

350

    STATBUF stbuf;

350

    STATBUF stbuf;

351

    int fd, nread;

351

    int fd, nread;

352

    uint32_t chunk;

352

    uint32_t chunk;

353

    fail_unless_fmt(STAT(SCANFILE, &stbuf) != -1, "stat failed for %s: %s", SCANFILE, strerror(errno));

353

    fail_unless_fmt(CLAMSTAT(SCANFILE, &stbuf) != -1, "stat failed for %s: %s", SCANFILE, strerror(errno));

354

355

    fd = open(SCANFILE, O_RDONLY);

355

    fd = open(SCANFILE, O_RDONLY);

356

    fail_unless_fmt(fd != -1, "open failed: %s\n", strerror(errno));

356

    fail_unless_fmt(fd != -1, "open failed: %s\n", strerror(errno));

Return to bug 8993