proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2026-01-04 02:56:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #189 from opensourcerouting/config-write-sync

Browse Source 
lib: use fsync() for config writes, plug fd leak
This commit is contained in:
Donald Sharp 2017-02-09 09:52:58 -05:00 committed by GitHub
commit b9aa3abbbe
2 changed files with 37 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
lib/command.c
View File

@ -1325,9 +1325,9 @@ DEFUN (config_write,
{
int idx_type = 1;
unsigned int i;
int fd;
int fd, dirfd;
struct cmd_node *node;
char *config_file;
char *config_file, *slash;
char *config_file_tmp = NULL;
char *config_file_sav = NULL;
int ret = CMD_WARNING;
@ -1378,6 +1378,21 @@ DEFUN (config_write,
/* Get filename. */
config_file = host.config;
#ifndef O_DIRECTORY
#define O_DIRECTORY 0
#endif
slash = strrchr (config_file, '/');
if (slash)
{
char *config_dir = XSTRDUP (MTYPE_TMP, config_file);
config_dir[slash - config_file] = '\0';
dirfd = open(config_dir, O_DIRECTORY | O_RDONLY);
XFREE (MTYPE_TMP, config_dir);
}
else
dirfd = open(".", O_DIRECTORY | O_RDONLY);
/* if dirfd is invalid, directory sync fails, but we're still OK */
config_file_sav =
XMALLOC (MTYPE_TMP, strlen (config_file) + strlen (CONF_BACKUP_EXT) + 1);
strcpy (config_file_sav, config_file);
@ -1395,6 +1410,12 @@ DEFUN (config_write,
VTY_NEWLINE);
goto finished;
}
if (fchmod (fd, CONFIGFILE_MASK) != 0)
{
vty_out (vty, "Can't chmod configuration file %s: %s (%d).%s",
config_file_tmp, safe_strerror(errno), errno, VTY_NEWLINE);
goto finished;
}
/* Make vty for configuration file. */
file_vty = vty_new ();
@ -1429,35 +1450,24 @@ DEFUN (config_write,
VTY_NEWLINE);
goto finished;
}
sync ();
if (unlink (config_file) != 0)
{
vty_out (vty, "Can't unlink configuration file %s.%s", config_file,
VTY_NEWLINE);
goto finished;
}
fsync (dirfd);
}
if (link (config_file_tmp, config_file) != 0)
if (rename (config_file_tmp, config_file) != 0)
{
vty_out (vty, "Can't save configuration file %s.%s", config_file,
VTY_NEWLINE);
goto finished;
}
sync ();
if (chmod (config_file, CONFIGFILE_MASK) != 0)
{
vty_out (vty, "Can't chmod configuration file %s: %s (%d).%s",
config_file, safe_strerror(errno), errno, VTY_NEWLINE);
goto finished;
}
fsync (dirfd);
vty_out (vty, "Configuration saved to %s%s", config_file,
VTY_NEWLINE);
ret = CMD_SUCCESS;
finished:
unlink (config_file_tmp);
if (ret != CMD_SUCCESS)
unlink (config_file_tmp);
close (dirfd);
XFREE (MTYPE_TMP, config_file_tmp);
XFREE (MTYPE_TMP, config_file_sav);
return ret;

9
lib/vty.c
View File

@ -2254,9 +2254,16 @@ vty_close (struct vty *vty)
/* Unset vector. */
vector_unset (vtyvec, vty->fd);
if (vty->wfd > 0 && vty->type == VTY_FILE)
fsync (vty->wfd);
/* Close socket. */
if (vty->fd > 0)
close (vty->fd);
{
close (vty->fd);
if (vty->wfd > 0 && vty->wfd != vty->fd)
close (vty->wfd);
}
else
was_stdio = true;