Merge remote-tracking branch 'qubesos/pr/1'

* qubesos/pr/1:
  Check if QubesIncoming filesystem supports O_TMPFILE
This commit is contained in:
Marek Marczykowski-Górecki 2015-11-13 02:59:31 +01:00
commit 83c03af067
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724

View File

@ -112,11 +112,11 @@ void process_one_file_reg(struct file_header *untrusted_hdr,
if (use_tmpfile) {
fdout = open(".", O_WRONLY | O_TMPFILE, 0700);
if (fdout < 0) {
if (errno==ENOENT)
/* if it fails, do not attempt further use - most likely kernel too old */
use_tmpfile = 0;
else
do_exit(errno, untrusted_name);
if (errno==ENOENT || /* most likely, kernel too old for O_TMPFILE */
errno==EOPNOTSUPP) /* filesystem has no support for O_TMPFILE */
use_tmpfile = 0;
else
do_exit(errno, untrusted_name);
}
}
if (fdout < 0)