JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

flock.cc: Fix stack allocation from callee used in caller

Browse Source 
* flock.cc (lockf_t::create_lock_obj_attr): Add buffer parameter.
	Call _everyone_sd with buffer argument from caller rather than
	everyone_sd with locally allocated stack buffer.
	(lockf_t::create_lock_obj): Call create_lock_obj_attr only once
	outside the loop and with additional buffer argument.
	(lockf_t::open_lock_obj): Call create_lock_obj_attr with additional
	buffer argument.
This commit is contained in:
Corinna Vinschen 2015-09-08 10:57:54 +02:00
parent 6d85fc4143
commit 44e0f5a703
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,13 @@
2015-09-08 Corinna Vinschen <corinna@vinschen.de>
* flock.cc (lockf_t::create_lock_obj_attr): Add buffer parameter.
Call _everyone_sd with buffer argument from caller rather than
everyone_sd with locally allocated stack buffer.
(lockf_t::create_lock_obj): Call create_lock_obj_attr only once
outside the loop and with additional buffer argument.
(lockf_t::open_lock_obj): Call create_lock_obj_attr with additional
buffer argument.
2015-08-29 Corinna Vinschen <corinna@vinschen.de> 2015-08-29 Corinna Vinschen <corinna@vinschen.de>
* fhandler_proc.cc (format_proc_cpuinfo): Fetch cache information * fhandler_proc.cc (format_proc_cpuinfo): Fetch cache information

14
winsup/cygwin/flock.cc
View File

@ -290,7 +290,7 @@ class lockf_t
{ cfree (p); } { cfree (p); }
POBJECT_ATTRIBUTES create_lock_obj_attr (lockfattr_t *attr, POBJECT_ATTRIBUTES create_lock_obj_attr (lockfattr_t *attr,
ULONG flags); ULONG flags, void *sd_buf);
void create_lock_obj (); void create_lock_obj ();
bool open_lock_obj (); bool open_lock_obj ();
@ -636,7 +636,7 @@ inode_t::get_all_locks_list ()
/* Create the lock object name. The name is constructed from the lock /* Create the lock object name. The name is constructed from the lock
properties which identify it uniquely, all values in hex. */ properties which identify it uniquely, all values in hex. */
POBJECT_ATTRIBUTES POBJECT_ATTRIBUTES
lockf_t::create_lock_obj_attr (lockfattr_t *attr, ULONG flags) lockf_t::create_lock_obj_attr (lockfattr_t *attr, ULONG flags, void *sd_buf)
{ {
__small_swprintf (attr->name, LOCK_OBJ_NAME_FMT, __small_swprintf (attr->name, LOCK_OBJ_NAME_FMT,
lf_flags & (F_POSIX | F_FLOCK), lf_type, lf_start, lf_end, lf_flags & (F_POSIX | F_FLOCK), lf_type, lf_start, lf_end,
@ -644,7 +644,7 @@ lockf_t::create_lock_obj_attr (lockfattr_t *attr, ULONG flags)
RtlInitCountedUnicodeString (&attr->uname, attr->name, RtlInitCountedUnicodeString (&attr->uname, attr->name,
LOCK_OBJ_NAME_LEN * sizeof (WCHAR)); LOCK_OBJ_NAME_LEN * sizeof (WCHAR));
InitializeObjectAttributes (&attr->attr, &attr->uname, flags, lf_inode->i_dir, InitializeObjectAttributes (&attr->attr, &attr->uname, flags, lf_inode->i_dir,
everyone_sd (FLOCK_EVENT_ACCESS)); _everyone_sd (sd_buf, FLOCK_EVENT_ACCESS));
return &attr->attr; return &attr->attr;
} }
@ -766,11 +766,13 @@ lockf_t::create_lock_obj ()
{ {
lockfattr_t attr; lockfattr_t attr;
NTSTATUS status; NTSTATUS status;
POBJECT_ATTRIBUTES lock_obj_attr;
lock_obj_attr = create_lock_obj_attr (&attr, OBJ_INHERIT,
alloca (SD_MIN_SIZE));
do do
{ {
status = NtCreateEvent (&lf_obj, CYG_EVENT_ACCESS, status = NtCreateEvent (&lf_obj, CYG_EVENT_ACCESS, lock_obj_attr,
create_lock_obj_attr (&attr, OBJ_INHERIT),
NotificationEvent, FALSE); NotificationEvent, FALSE);
if (!NT_SUCCESS (status)) if (!NT_SUCCESS (status))
{ {
@ -852,7 +854,7 @@ lockf_t::open_lock_obj ()
NTSTATUS status; NTSTATUS status;
status = NtOpenEvent (&lf_obj, FLOCK_EVENT_ACCESS, status = NtOpenEvent (&lf_obj, FLOCK_EVENT_ACCESS,
create_lock_obj_attr (&attr, 0)); create_lock_obj_attr (&attr, 0, alloca (SD_MIN_SIZE)));
if (!NT_SUCCESS (status)) if (!NT_SUCCESS (status))
{ {
SetLastError (RtlNtStatusToDosError (status)); SetLastError (RtlNtStatusToDosError (status));