d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

memfd_create: fix return values

Browse Source 
Literally returning EINVAL from a function designed to return an fd makes
for interesting scenarios.

I cannot assign enough pointy hats to cover this one.
This commit is contained in:
Kyle Evans 2020-09-10 21:25:16 +00:00
parent 7978363417
commit 9bf2b80ca6
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=365615
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/libc/sys/shm_open.c
View File

@ -115,18 +115,26 @@ memfd_create(const char *name, unsigned int flags)
struct shm_largepage_conf slc;
int error, fd, i, npgs, oflags, pgidx, saved_errno, shmflags;
if (name == NULL)
return (EBADF);
if (name == NULL) {
errno = EBADF;
return (-1);
}
namelen = strlen(name);
if (namelen + sizeof(MEMFD_NAME_PREFIX) - 1 > NAME_MAX)
return (EINVAL);
if (namelen + sizeof(MEMFD_NAME_PREFIX) - 1 > NAME_MAX) {
errno = EINVAL;
return (-1);
}
if ((flags & ~(MFD_CLOEXEC | MFD_ALLOW_SEALING | MFD_HUGETLB |
MFD_HUGE_MASK)) != 0)
return (EINVAL);
MFD_HUGE_MASK)) != 0) {
errno = EINVAL;
return (-1);
}
/* Size specified but no HUGETLB. */
if (((flags & MFD_HUGE_MASK) != 0 && (flags & MFD_HUGETLB) == 0) ||
__bitcount(flags & MFD_HUGE_MASK) > 1)
return (EINVAL);
__bitcount(flags & MFD_HUGE_MASK) > 1) {
errno = EINVAL;
return (-1);
}
/* We've already validated that we're sufficiently sized. */
snprintf(memfd_name, NAME_MAX + 1, "%s%s", MEMFD_NAME_PREFIX, name);