Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-11-16 12:34:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

posix: Only check shm_unlink obj_err if necessary

Browse Source 
In the nominal case checked by spsysinit01, obj_err is unmodified if
_POSIX_Shm_Get_by_name returns non-NULL. In the case of shm_unlink, this means
an uninitialized value is passed into the switch and it appears tests using it
were passing by virtue of the stack having the right value on it in most cases.
This now checks obj_err only if _POSIX_Shm_Get_by_name returns NULL.

Close #4016
This commit is contained in:
Kinsey Moore
2020-06-27 19:21:45 -05:00
committed by Joel Sherrill
parent 95036a4591
commit e95c00a79e
1 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
cpukit/posix/src/shmunlink.c
View File

@@ -29,28 +29,29 @@ int shm_unlink( const char *name )
_Objects_Allocator_lock();
shm = _POSIX_Shm_Get_by_name( name, 0, &obj_err );
switch ( obj_err ) {
case OBJECTS_GET_BY_NAME_INVALID_NAME:
err = ENOENT;
break;
if ( shm ) {
_Objects_Namespace_remove_string(
&_POSIX_Shm_Information,
&shm->Object
);
case OBJECTS_GET_BY_NAME_NAME_TOO_LONG:
err = ENAMETOOLONG;
break;
if ( shm->reference_count == 0 ) {
/* Only remove the shm object if no references exist to it. Otherwise,
* the shm object will be freed later in _POSIX_Shm_Attempt_delete */
_POSIX_Shm_Free( shm );
}
} else {
switch ( obj_err ) {
case OBJECTS_GET_BY_NAME_NAME_TOO_LONG:
err = ENAMETOOLONG;
break;
case OBJECTS_GET_BY_NAME_NO_OBJECT:
default:
_Objects_Namespace_remove_string(
&_POSIX_Shm_Information,
&shm->Object
);
if ( shm->reference_count == 0 ) {
/* Only remove the shm object if no references exist to it. Otherwise,
* the shm object will be freed later in _POSIX_Shm_Attempt_delete */
_POSIX_Shm_Free( shm );
}
break;
case OBJECTS_GET_BY_NAME_INVALID_NAME:
case OBJECTS_GET_BY_NAME_NO_OBJECT:
default:
err = ENOENT;
break;
}
}
_Objects_Allocator_unlock();