vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

slirp/smb: Replace constant strings by glib string 

gcc 7 (on fedora 26) objects to many of the snprintf's
in the smb path and command creation because it can't
figure out that the smb_dir (i.e. the /tmp dir for the configuration)
is known to be short.

Replace all these fixed length buffers by g_str* functions that dynamically
allocate and use g_dir_make_tmp to make the directory.
(It's fairly new glib but we have a compat function for it).

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
master
Dr. David Alan Gilbert 2017-04-07 15:32:54 +01:00 committed by Samuel Thibault
parent 0bed71edbc
commit f95cc8b6cc
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
net/slirp.c
View File

@ -80,7 +80,7 @@ typedef struct SlirpState {
Slirp *slirp; Slirp *slirp;
Notifier exit_notifier; Notifier exit_notifier;
#ifndef _WIN32 #ifndef _WIN32
char smb_dir[128]; gchar *smb_dir;
#endif #endif
} SlirpState; } SlirpState;
@ -558,11 +558,10 @@ int net_slirp_redir(const char *redir_str)
/* automatic user mode samba server configuration */ /* automatic user mode samba server configuration */
static void slirp_smb_cleanup(SlirpState *s) static void slirp_smb_cleanup(SlirpState *s)
{ {
char cmd[128];
int ret; int ret;
if (s->smb_dir[0] != '\0') { if (s->smb_dir) {
snprintf(cmd, sizeof(cmd), "rm -rf %s", s->smb_dir); gchar *cmd = g_strdup_printf("rm -rf %s", s->smb_dir);
ret = system(cmd); ret = system(cmd);
if (ret == -1 || !WIFEXITED(ret)) { if (ret == -1 || !WIFEXITED(ret)) {
error_report("'%s' failed.", cmd); error_report("'%s' failed.", cmd);
@ -570,15 +569,17 @@ static void slirp_smb_cleanup(SlirpState *s)
error_report("'%s' failed. Error code: %d", error_report("'%s' failed. Error code: %d",
cmd, WEXITSTATUS(ret)); cmd, WEXITSTATUS(ret));
} }
s->smb_dir[0] = '\0'; g_free(cmd);
g_free(s->smb_dir);
s->smb_dir = NULL;
} }
} }
static int slirp_smb(SlirpState* s, const char *exported_dir, static int slirp_smb(SlirpState* s, const char *exported_dir,
struct in_addr vserver_addr) struct in_addr vserver_addr)
{ {
char smb_conf[128]; char *smb_conf;
char smb_cmdline[128]; char *smb_cmdline;
struct passwd *passwd; struct passwd *passwd;
FILE *f; FILE *f;
@ -600,19 +601,19 @@ static int slirp_smb(SlirpState* s, const char *exported_dir,
return -1; return -1;
} }
snprintf(s->smb_dir, sizeof(s->smb_dir), "/tmp/qemu-smb.XXXXXX"); s->smb_dir = g_dir_make_tmp("qemu-smb.XXXXXX", NULL);
if (!mkdtemp(s->smb_dir)) { if (!s->smb_dir) {
error_report("could not create samba server dir '%s'", s->smb_dir); error_report("could not create samba server dir");
s->smb_dir[0] = 0;
return -1; return -1;
} }
snprintf(smb_conf, sizeof(smb_conf), "%s/%s", s->smb_dir, "smb.conf"); smb_conf = g_strdup_printf("%s/%s", s->smb_dir, "smb.conf");
f = fopen(smb_conf, "w"); f = fopen(smb_conf, "w");
if (!f) { if (!f) {
slirp_smb_cleanup(s); slirp_smb_cleanup(s);
error_report("could not create samba server configuration file '%s'", error_report("could not create samba server configuration file '%s'",
smb_conf); smb_conf);
g_free(smb_conf);
return -1; return -1;
} }
fprintf(f, fprintf(f,
@ -651,15 +652,18 @@ static int slirp_smb(SlirpState* s, const char *exported_dir,
); );
fclose(f); fclose(f);
snprintf(smb_cmdline, sizeof(smb_cmdline), "%s -l %s -s %s", smb_cmdline = g_strdup_printf("%s -l %s -s %s",
CONFIG_SMBD_COMMAND, s->smb_dir, smb_conf); CONFIG_SMBD_COMMAND, s->smb_dir, smb_conf);
g_free(smb_conf);
if (slirp_add_exec(s->slirp, 0, smb_cmdline, &vserver_addr, 139) < 0 || if (slirp_add_exec(s->slirp, 0, smb_cmdline, &vserver_addr, 139) < 0 ||
slirp_add_exec(s->slirp, 0, smb_cmdline, &vserver_addr, 445) < 0) { slirp_add_exec(s->slirp, 0, smb_cmdline, &vserver_addr, 445) < 0) {
slirp_smb_cleanup(s); slirp_smb_cleanup(s);
g_free(smb_cmdline);
error_report("conflicting/invalid smbserver address"); error_report("conflicting/invalid smbserver address");
return -1; return -1;
} }
g_free(smb_cmdline);
return 0; return 0;
} }