/mandos/trunk : revision 704

To get this branch, use:

bzr branch
http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to plugins.d/mandos-client.c

Committer: Teddy Hogeborn
Date: 2014-06-14 23:29:00 UTC
Revision ID: teddy@recompile.se-20140614232900-vhcywskev4u8rz2d

mandos-client: Fix some bugs on error conditions.

* plugins.d/mandos-client.c (run_network_hooks): Init "dirent" to NULL
                                                 and, later, always
                                                 free() it unless
                                                 scandirat() or
                                                 scandir() failed.
  (main): Fix free() of uninitalized memory in case scandirat() or
          scandir() of "/sys/class/net" failed.  Also, when cleaning
          up, even if GPGME temp directory is empty, do
          free(direntries) and remove the directory.

Show diffs side-by-side

added added

removed removed

plugins.d/mandos-client.c

234

.af = af };

235

if(new_server->ip == NULL){

236

perror_plus("strdup");

237

free(new_server);

238

237

return false;

239

238

}

240

239

ret = clock_gettime(CLOCK_MONOTONIC, &(new_server->last_seen));

241

240

if(ret == -1){

242

241

perror_plus("clock_gettime");

243

#ifdef __GNUC__

244

#pragma GCC diagnostic push

245

#pragma GCC diagnostic ignored "-Wcast-qual"

246

#endif

247

free((char *)(new_server->ip));

248

#ifdef __GNUC__

249

#pragma GCC diagnostic pop

250

#endif

251

free(new_server);

252

242

return false;

253

243

}

254

244

/* Special case of first server */

1076

1066

timed out */

1077

1067

1078

1068

if(quit_now){

1079

avahi_s_service_resolver_free(r);

1080

1069

return;

1081

1070

}

1082

1071

1469

1458

error_t ret_errno = 0;

1470

1459

if(seteuid(0) == -1){

1471

1460

ret_errno = errno;

1461

perror_plus("seteuid");

1472

1462

}

1473

1463

errno = old_errno;

1474

1464

return ret_errno;

1485

1475

}

1486

1476

if(setuid(0) == -1){

1487

1477

ret_errno = errno;

1478

perror_plus("seteuid");

1488

1479

}

1489

1480

errno = old_errno;

1490

1481

return ret_errno;

1497

1488

error_t ret_errno = 0;

1498

1489

if(seteuid(uid) == -1){

1499

1490

ret_errno = errno;

1491

perror_plus("seteuid");

1500

1492

}

1501

1493

errno = old_errno;

1502

1494

return ret_errno;

1509

1501

error_t ret_errno = 0;

1510

1502

if(setuid(uid) == -1){

1511

1503

ret_errno = errno;

1504

perror_plus("setuid");

1512

1505

}

1513

1506

errno = old_errno;

1514

1507

return ret_errno;

1561

1554

if(hook_pid == 0){

1562

1555

/* Child */

1563

1556

/* Raise privileges */

1564

errno = raise_privileges_permanently();

1565

if(errno != 0){

1557

if(raise_privileges_permanently() != 0){

1566

1558

perror_plus("Failed to raise privileges");

1567

1559

_exit(EX_NOPERM);

1568

1560

}

1653

1645

int status;

1654

1646

if(TEMP_FAILURE_RETRY(waitpid(hook_pid, &status, 0)) == -1){

1655

1647

perror_plus("waitpid");

1656

free(direntry);

1657

1648

continue;

1658

1649

}

1659

1650

if(WIFEXITED(status)){

1661

1652

fprintf_plus(stderr, "Warning: network hook \"%s\" exited"

1662

1653

" with status %d\n", direntry->d_name,

1663

1654

WEXITSTATUS(status));

1664

free(direntry);

1665

1655

continue;

1666

1656

}

1667

1657

} else if(WIFSIGNALED(status)){

1668

1658

fprintf_plus(stderr, "Warning: network hook \"%s\" died by"

1669

1659

" signal %d\n", direntry->d_name,

1670

1660

WTERMSIG(status));

1671

free(direntry);

1672

1661

continue;

1673

1662

} else {

1674

1663

fprintf_plus(stderr, "Warning: network hook \"%s\""

1675

1664

" crashed\n", direntry->d_name);

1676

free(direntry);

1677

1665

continue;

1678

1666

}

1679

1667

}

1681

1669

fprintf_plus(stderr, "Network hook \"%s\" ran successfully\n",

1682

1670

direntry->d_name);

1683

1671

}

1684

free(direntry);

1685

1672

}

1686

1673

free(direntries);

1687

1674

if((int)TEMP_FAILURE_RETRY(close(hookdir_fd)) == -1){

1746

1733

/* Raise privileges */

1747

1734

ret_errno = raise_privileges();

1748

1735

if(ret_errno != 0){

1749

errno = ret_errno;

1750

1736

perror_plus("Failed to raise privileges");

1751

1737

}

1752

1738

1856

1842

/* Raise privileges */

1857

1843

ret_errno = raise_privileges();

1858

1844

if(ret_errno != 0){

1859

errno = ret_errno;

1860

1845

perror_plus("Failed to raise privileges");

1861

1846

}

1862

1847

2281

2266

if(ret_errno != 0){

2282

2267

errno = ret_errno;

2283

2268

perror_plus("argz_add");

2284

free(direntries[i]);

2285

2269

continue;

2286

2270

}

2287

2271

if(debug){

2288

2272

fprintf_plus(stderr, "Will use interface \"%s\"\n",

2289

2273

direntries[i]->d_name);

2290

2274

}

2291

free(direntries[i]);

2292

2275

}

2293

2276

free(direntries);

2294

2277

} else {

2564

2547

mc.current_server->prev->next = NULL;

2565

2548

while(mc.current_server != NULL){

2566

2549

server *next = mc.current_server->next;

2567

#ifdef __GNUC__

2568

#pragma GCC diagnostic push

2569

#pragma GCC diagnostic ignored "-Wcast-qual"

2570

#endif

2571

free((char *)(mc.current_server->ip));

2572

#ifdef __GNUC__

2573

#pragma GCC diagnostic pop

2574

#endif

2575

2550

free(mc.current_server);

2576

2551

mc.current_server = next;

2577

2552

}

2581

2556

{

2582

2557

ret_errno = raise_privileges();

2583

2558

if(ret_errno != 0){

2584

errno = ret_errno;

2585

2559

perror_plus("Failed to raise privileges");

2586

2560

} else {

2587

2561

2610

2584

2611

2585

ret_errno = lower_privileges_permanently();

2612

2586

if(ret_errno != 0){

2613

errno = ret_errno;

2614

2587

perror_plus("Failed to lower privileges permanently");

2615

2588

}

2616

2589

}

2646

2619

" \"%s\", 0): %s\n", tempdir,

2647

2620

direntries[i]->d_name, strerror(errno));

2648

2621

}

2649

free(direntries[i]);

2650

2622

}

2651

2623

2652

2624

/* need to clean even if 0 because man page doesn't specify */

Older »