Re: [PATCH 5/7] simple-ipc/ipc-win32: add Windows ACL to named pipe
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Sep 17, 2021, 19:14 UTC
- Message-ID
- <87h7ejdn9j.fsf@evledraar.gmail.com>
- In-Reply-To
- <9b1c8691-936f-c481-e3af-dd94efa57152@jeffhostetler.com>
On Fri, Sep 17 2021, Jeff Hostetler wrote:
Show 68 quoted lines
> On 9/16/21 1:47 AM, Ævar Arnfjörð Bjarmason wrote:
>> On Wed, Sep 15 2021, Jeff Hostetler via GitGitGadget wrote:
>>
>>> +struct my_sa_data
>>> +{
>>> + PSID pEveryoneSID;
>>> + PACL pACL;
>>> + PSECURITY_DESCRIPTOR pSD;
>>> + LPSECURITY_ATTRIBUTES lpSA;
>>> +};
>>> +
>>> +static void init_sa(struct my_sa_data *d)
>>> +{
>>> + memset(d, 0, sizeof(*d));
>>> +}
>>> +
>>> +static void release_sa(struct my_sa_data *d)
>>> +{
>>> + if (d->pEveryoneSID)
>>> + FreeSid(d->pEveryoneSID);
>>> + if (d->pACL)
>>> + LocalFree(d->pACL);
>>> + if (d->pSD)
>>> + LocalFree(d->pSD);
>>> + if (d->lpSA)
>>> + LocalFree(d->lpSA);
>>> +
>>> + memset(d, 0, sizeof(*d));
>>> +}
>> [...]
>>
>>> +fail:
>>> + release_sa(d);
>>> + return NULL;
>>> +}
>>> +
>>> static HANDLE create_new_pipe(wchar_t *wpath, int is_first)
>>> {
>>> HANDLE hPipe;
>>> DWORD dwOpenMode, dwPipeMode;
>>> - LPSECURITY_ATTRIBUTES lpsa = NULL;
>>> + struct my_sa_data my_sa_data;
>>> +
>>> + init_sa(&my_sa_data);
>>>
>> [...]
>>
>>> hPipe = CreateNamedPipeW(wpath, dwOpenMode, dwPipeMode,
>>> - PIPE_UNLIMITED_INSTANCES, 1024, 1024, 0, lpsa);
>>> + PIPE_UNLIMITED_INSTANCES, 1024, 1024, 0,
>>> + my_sa_data.lpSA);
>>> +
>>> + release_sa(&my_sa_data);
>>> return hPipe;
>>> }
>> Just a nit on the init pattern, since we always allocate this on the
>> stack (this as all the relevant "struct my_sa_data") I'd have thought to
>> see:
>> #define INIT_MY_SA_DATA { 0 }
>> [...]
>> struct my_sa_data my_sa_data = INIT_MY_SA_DATA;
>> Which gets rid of the need for an init_sa() function.
>
> The current "my_sa_data" is just a set of 4 pointers, so yes your
> INIT_MY_SA_DATA macro and my init_sa function are equivalent.
> (And assuming that mine and memset are inlined by the compiler, they
> are both probably exactly equivalent.) So it really doesn't matter
> one way or the other.Yes it's the same to the compiler, see 5726a6b4012 (*.c *_init(): define in terms of corresponding *_INIT macro, 2021-07-01).
But being the same to the compiler != the same to human readers. I was going for the latter here, i.e. in git.git init with a macro tends to be used if the init is simple enough to be run like that, and with a function if it really does need to run some function (and then after 5726a6b4012 the init-via-function-via-macro for things that need init after malloc() or whatever).
Whereas this one's just on the stack, and doesn't need anything special, so the nit was about just preferring the simplest construct for the job.
Show 27 quoted lines
>> Also having the release_sa() do a memset() is a bit odd, usually we >> have >> a reset*() function do that if the intent is to re-use, but it doesn't >> appear to be in this case, and we don't return this data anywhere, do >> we? >> > > I use the release_sa() function inside my "fail:" label in get_sa() > to cleanup if any of the component parts of the SA cannot be created. > So the return value of get_sa() is either fully constructed or contains > NULL pointers. > > (The docs are jargon heavy and little obscure and circular and it > is not at all clear if/when we might fail to create some of these > sub-structures.) > > So I allow the SA failure to be silently ignored and we create the named > pipe without an ACL. Normally, this is fine since the daemon usually > isn't elevated. > > In create_new_pipe we always call release_sa to free the pointers if > necessary. (So in case of a failure in get_sa, we won't double free > the pointers when create_new_pipe calls release_sa.) > > Another way to think of it is that in release_sa, I'd like to have > FREE_AND_NULL() variants for FreeSid() and LocalFree(), but a simple > memset is sufficient.
*nod*, I meant if functions are doing that sort of intent-to-reuse we usually call them *_reset(), with a *_release() that's just a plain free() and forget.