Re: [PATCH 5/8] unix-stream-server: add st_dev and st_mode to socket stolen checks
- From
- Jeff Hostetler <git@jeffhostetler.com>
- Date
- Mar 8, 2021, 14:14 UTC
- Message-ID
- <f74c7b94-0378-edfc-6f34-18c896570a3e@jeffhostetler.com>
- In-Reply-To
- <05f4cb97-5d78-4698-795d-311197052e22@web.de>
On 3/6/21 6:42 AM, René Scharfe wrote:
Show 30 quoted lines
> Am 04.03.21 um 21:17 schrieb Jeff Hostetler via GitGitGadget: >> From: Jeff Hostetler <jeffhost@microsoft.com> >> >> When checking to see if our unix domain socket was stolen, also check >> whether the st.st_dev and st.st_mode fields changed (in addition to >> the st.st_ino field). >> >> The inode by itself is not unique; it is only unique on a given >> device. >> >> Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com> >> --- >> unix-stream-server.c | 5 ++++- >> 1 file changed, 4 insertions(+), 1 deletion(-) >> >> diff --git a/unix-stream-server.c b/unix-stream-server.c >> index f00298ca7ec3..366ece69306b 100644 >> --- a/unix-stream-server.c >> +++ b/unix-stream-server.c >> @@ -120,8 +120,11 @@ int unix_stream_server__was_stolen( >> >> if (st_now.st_ino != server_socket->st_socket.st_ino) >> return 1; >> + if (st_now.st_dev != server_socket->st_socket.st_dev) >> + return 1; >> >> - /* We might also consider the ctime on some platforms. */ > > Why remove that comment? (This change is not mentioned in the commit > message.)
I added it as a TODO to myself thinking that it might give us additional assurances on some platforms while I was originally getting things working. In hindsight (and now that we have the lockfile helping us), I didn't think it was actually needed, so I removed it.
I didn't think it warranted a mention in the commit message.
Show 8 quoted lines
> >> + if (!S_ISSOCK(st_now.st_mode)) >> + return 1; >> >> return 0; >> } >> >