Attachment #336554 for bug #453634

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

Lines 1822-1828 Link Here

(-)systemd-197.old/src/core/manager.c (-1 / +1 lines)
1822	return -ENOMEM;	1822	return -ENOMEM;
1823		1823
1824	saved_umask = umask(0077);	1824	saved_umask = umask(0077);
1825	fd = mkostemp(path, O_RDWR\|O_CLOEXEC);	1825	fd = mkstemp(path);
1826	umask(saved_umask);	1826	umask(saved_umask);
1827		1827
1828	if (fd < 0) {	1828	if (fd < 0) {

Lines 143-150 Link Here

(-)systemd-197.old/src/journal/cat.c (-3 / +3 lines)
143		143
144	saved_stderr = fcntl(STDERR_FILENO, F_DUPFD_CLOEXEC, 3);	144	saved_stderr = fcntl(STDERR_FILENO, F_DUPFD_CLOEXEC, 3);
145		145
146	if (dup3(fd, STDOUT_FILENO, 0) < 0 \|\|	146	if (dup2(fd, STDOUT_FILENO) < 0 \|\|
147	dup3(fd, STDERR_FILENO, 0) < 0) {	147	dup2(fd, STDERR_FILENO) < 0) {
148	log_error("Failed to duplicate fd: %m");	148	log_error("Failed to duplicate fd: %m");
149	r = -errno;	149	r = -errno;
150	goto finish;	150	goto finish;
Lines 164-170 Link Here
164		164
165	/* Let's try to restore a working stderr, so we can print the error message */	165	/* Let's try to restore a working stderr, so we can print the error message */
166	if (saved_stderr >= 0)	166	if (saved_stderr >= 0)
167	dup3(saved_stderr, STDERR_FILENO, 0);	167	dup2(saved_stderr, STDERR_FILENO);
168		168
169	log_error("Failed to execute process: %s", strerror(-r));	169	log_error("Failed to execute process: %s", strerror(-r));
170		170

Lines 472-478 Link Here

(-)systemd-197.old/src/journal/coredumpctl.c (-1 / +1 lines)
472	data = (const uint8_t*) data + 9;	472	data = (const uint8_t*) data + 9;
473	len -= 9;	473	len -= 9;
474		474
475	fd = mkostemp(path, O_WRONLY);	475	fd = mkstemp(path);
476	if (fd < 0) {	476	if (fd < 0) {
477	log_error("Failed to create temporary file: %m");	477	log_error("Failed to create temporary file: %m");
478	return -errno;	478	return -errno;

Lines 330-336 Link Here

(-)systemd-197.old/src/journal/journal-send.c (-1 / +1 lines)
330	* file and just pass a file descriptor of it to the other	330	* file and just pass a file descriptor of it to the other
331	* side */	331	* side */
332		332
333	buffer_fd = mkostemp(path, O_CLOEXEC\|O_RDWR);	333	buffer_fd = mkstemp(path);
334	if (buffer_fd < 0) {	334	if (buffer_fd < 0) {
335	r = -errno;	335	r = -errno;
336	goto finish;	336	goto finish;




        } else if (f->seal)
                return -ENOKEY;

        data_fd = mkstemp(data_path);
        if (data_fd < 0) {
                log_error("Failed to create data file: %m");
                r = -errno;

        }
        unlink(data_path);

        entry_fd = mkstemp(entry_path);
        if (entry_fd < 0) {
                log_error("Failed to create entry file: %m");
                r = -errno;

        }
        unlink(entry_path);

        entry_array_fd = mkstemp(entry_array_path);
        if (entry_array_fd < 0) {
                log_error("Failed to create entry array file: %m");
                r = -errno;

Lines 662-668 Link Here

(-)systemd-197.old/src/journal/journalctl.c (-1 / +1 lines)
662	n /= arg_interval;	662	n /= arg_interval;
663		663
664	close_nointr_nofail(fd);	664	close_nointr_nofail(fd);
665	fd = mkostemp(k, O_WRONLY\|O_CLOEXEC\|O_NOCTTY);	665	fd = mkstemp(k);
666	if (fd < 0) {	666	if (fd < 0) {
667	log_error("Failed to open %s: %m", k);	667	log_error("Failed to open %s: %m", k);
668	r = -errno;	668	r = -errno;

Lines 326-332 Link Here

(-)systemd-197.old/src/shared/ask-password-api.c (-1 / +1 lines)
326	mkdir_p_label("/run/systemd/ask-password", 0755);	326	mkdir_p_label("/run/systemd/ask-password", 0755);
327		327
328	u = umask(0022);	328	u = umask(0022);
329	fd = mkostemp(temp, O_CLOEXEC\|O_CREAT\|O_WRONLY);	329	fd = mkstemp(temp);
330	umask(u);	330	umask(u);
331		331
332	if (fd < 0) {	332	if (fd < 0) {





        assert(fd >= 0);

        r = dup2(fd, STDIN_FILENO);
        s = dup2(fd, STDOUT_FILENO);
        t = dup2(fd, STDERR_FILENO);

        if (fd >= 3)
                close_nointr_nofail(fd);

        t[k] = '.';
        stpcpy(stpcpy(t+k+1, fn), "XXXXXX");

        fd = mkstemp(t);
        if (fd < 0) {
                free(t);
                return -errno;

Return to bug 453634

Lines 701-707 Link Here

(-)systemd-197.old/src/journal/journal-verify.c (-3 / +3 lines)
701	} else if (f->seal)	701	} else if (f->seal)
702	return -ENOKEY;	702	return -ENOKEY;
703		703
704	data_fd = mkostemp(data_path, O_CLOEXEC);	704	data_fd = mkstemp(data_path);
705	if (data_fd < 0) {	705	if (data_fd < 0) {
706	log_error("Failed to create data file: %m");	706	log_error("Failed to create data file: %m");
707	r = -errno;	707	r = -errno;
Lines 709-715 Link Here
709	}	709	}
710	unlink(data_path);	710	unlink(data_path);
711		711
712	entry_fd = mkostemp(entry_path, O_CLOEXEC);	712	entry_fd = mkstemp(entry_path);
713	if (entry_fd < 0) {	713	if (entry_fd < 0) {
714	log_error("Failed to create entry file: %m");	714	log_error("Failed to create entry file: %m");
715	r = -errno;	715	r = -errno;
Lines 717-723 Link Here
717	}	717	}
718	unlink(entry_path);	718	unlink(entry_path);
719		719
720	entry_array_fd = mkostemp(entry_array_path, O_CLOEXEC);	720	entry_array_fd = mkstemp(entry_array_path);
721	if (entry_array_fd < 0) {	721	if (entry_array_fd < 0) {
722	log_error("Failed to create entry array file: %m");	722	log_error("Failed to create entry array file: %m");
723	r = -errno;	723	r = -errno;

Lines 2588-2596 Link Here

(-)systemd-197.old/src/shared/util.c (-4 / +4 lines)
2588		2588
2589	assert(fd >= 0);	2589	assert(fd >= 0);
2590		2590
2591	r = dup3(fd, STDIN_FILENO, 0);	2591	r = dup2(fd, STDIN_FILENO);
2592	s = dup3(fd, STDOUT_FILENO, 0);	2592	s = dup2(fd, STDOUT_FILENO);
2593	t = dup3(fd, STDERR_FILENO, 0);	2593	t = dup2(fd, STDERR_FILENO);
2594		2594
2595	if (fd >= 3)	2595	if (fd >= 3)
2596	close_nointr_nofail(fd);	2596	close_nointr_nofail(fd);
Lines 4133-4139 Link Here
4133	t[k] = '.';	4133	t[k] = '.';
4134	stpcpy(stpcpy(t+k+1, fn), "XXXXXX");	4134	stpcpy(stpcpy(t+k+1, fn), "XXXXXX");
4135		4135
4136	fd = mkostemp(t, O_WRONLY\|O_CLOEXEC);	4136	fd = mkstemp(t);
4137	if (fd < 0) {	4137	if (fd < 0) {
4138	free(t);	4138	free(t);
4139	return -errno;	4139	return -errno;