AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-14 01:00:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

nptl: Use __pthread_attr_copy in pthread_setattr_default_np

Browse Source 
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Tested-by: Carlos O'Donell <carlos@redhat.com>
This commit is contained in:
Florian Weimer 2020-05-18 18:11:48 +02:00
parent cea81e2b7e
commit 7bf1094e82
1 changed files with 14 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
nptl/pthread_setattr_default_np.c
View File

@ -26,7 +26,6 @@ int
pthread_setattr_default_np (const pthread_attr_t *in) pthread_setattr_default_np (const pthread_attr_t *in)
{ {
const struct pthread_attr *real_in; const struct pthread_attr *real_in;
struct pthread_attr attrs;
int ret; int ret;
real_in = (struct pthread_attr *) in; real_in = (struct pthread_attr *) in;
@ -58,49 +57,27 @@ pthread_setattr_default_np (const pthread_attr_t *in)
if (real_in->flags & ATTR_FLAG_STACKADDR) if (real_in->flags & ATTR_FLAG_STACKADDR)
return EINVAL; return EINVAL;
attrs = *real_in; union pthread_attr_transparent temp;
ret = __pthread_attr_copy (&temp.external, in);
if (ret != 0)
return ret;
/* Now take the lock because we start writing into /* Now take the lock because we start accessing
__default_pthread_attr. */ __default_pthread_attr. */
lll_lock (__default_pthread_attr_lock, LLL_PRIVATE); lll_lock (__default_pthread_attr_lock, LLL_PRIVATE);
/* Free the cpuset if the input is 0. Otherwise copy in the cpuset /* Preserve the previous stack size (see above). */
contents. */ if (temp.internal.stacksize == 0)
size_t cpusetsize = attrs.cpusetsize; temp.internal.stacksize = __default_pthread_attr.stacksize;
if (cpusetsize == 0)
{
free (__default_pthread_attr.cpuset);
__default_pthread_attr.cpuset = NULL;
}
else if (cpusetsize == __default_pthread_attr.cpusetsize)
{
attrs.cpuset = __default_pthread_attr.cpuset;
memcpy (attrs.cpuset, real_in->cpuset, cpusetsize);
}
else
{
/* This may look wrong at first sight, but it isn't. We're freeing
__default_pthread_attr.cpuset and allocating to attrs.cpuset because
we'll copy over all of attr to __default_pthread_attr later. */
cpu_set_t *newp = realloc (__default_pthread_attr.cpuset,
cpusetsize);
if (newp == NULL) /* Destroy the old attribute structure because it will be
{ overwritten. */
ret = ENOMEM; __pthread_attr_destroy ((pthread_attr_t *) &__default_pthread_attr);
goto out;
}
attrs.cpuset = newp; /* __default_pthread_attr takes ownership, so do not free
memcpy (attrs.cpuset, real_in->cpuset, cpusetsize); attrs.internal after this point. */
} __default_pthread_attr = temp.internal;
/* We don't want to accidentally set the default stacksize to zero. */
if (attrs.stacksize == 0)
attrs.stacksize = __default_pthread_attr.stacksize;
__default_pthread_attr = attrs;
out:
lll_unlock (__default_pthread_attr_lock, LLL_PRIVATE); lll_unlock (__default_pthread_attr_lock, LLL_PRIVATE);
return ret; return ret;
} }