From: Jonathan Nieder <jrnieder@gmail.com>
To: David Turner <dturner@twosigma.com>
Cc: git@vger.kernel.org, l.s.r@web.de
Subject: Re: [PATCH v3 1/2] use HOST_NAME_MAX to size buffers for gethostname(2)
Date: Tue, 18 Apr 2017 18:28:24 -0700 [thread overview]
Message-ID: <20170419012824.GA28740@aiede.svl.corp.google.com> (raw)
In-Reply-To: <20170418215743.18406-2-dturner@twosigma.com>
Hi,
David Turner wrote:
> From: René Scharfe <l.s.r@web.de>
>
> POSIX limits the length of host names to HOST_NAME_MAX. Export the
> fallback definition from daemon.c and use this constant to make all
> buffers used with gethostname(2) big enough for any possible result
> and a terminating NUL.
Since some platforms do not define HOST_NAME_MAX and we provide a
fallback, this is not actually big enough for any possible result.
For example, the Hurd allows arbitrarily long hostnames.
Nevertheless this patch seems like the right thing to do.
> Inspired-by: David Turner <dturner@twosigma.com>
> Signed-off-by: Rene Scharfe <l.s.r@web.de>
> Signed-off-by: David Turner <dturner@twosigma.com>
> ---
> builtin/gc.c | 10 +++++++---
> builtin/receive-pack.c | 2 +-
> daemon.c | 4 ----
> fetch-pack.c | 2 +-
> git-compat-util.h | 4 ++++
> ident.c | 2 +-
> 6 files changed, 14 insertions(+), 10 deletions(-)
Thanks for picking this up.
[...]
> +++ b/builtin/gc.c
[...]
> @@ -257,8 +257,12 @@ static const char *lock_repo_for_gc(int force, pid_t* ret_pid)
> fd = hold_lock_file_for_update(&lock, pidfile_path,
> LOCK_DIE_ON_ERROR);
> if (!force) {
> - static char locking_host[128];
> + static char locking_host[HOST_NAME_MAX + 1];
> + static char *scan_fmt;
> int should_exit;
> +
> + if (!scan_fmt)
> + scan_fmt = xstrfmt("%s %%%dc", "%"SCNuMAX, HOST_NAME_MAX);
> fp = fopen(pidfile_path, "r");
> memset(locking_host, 0, sizeof(locking_host));
> should_exit =
> @@ -274,7 +278,7 @@ static const char *lock_repo_for_gc(int force, pid_t* ret_pid)
> * running.
> */
> time(NULL) - st.st_mtime <= 12 * 3600 &&
> - fscanf(fp, "%"SCNuMAX" %127c", &pid, locking_host) == 2 &&
> + fscanf(fp, scan_fmt, &pid, locking_host) == 2 &&
I hoped this could be simplified since HOST_NAME_MAX is a numeric literal,
using the double-expansion trick:
#define STR_(s) # s
#define STR(s) STR_(s)
fscanf(fp, "%" SCNuMAX " %" STR(HOST_NAME_MAX) "c",
&pid, locking_host);
Unfortunately, I don't think there's anything stopping a platform from
defining
#define HOST_NAME_MAX 0x100
which would break that.
So this run-time calculation appears to be necessary.
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Thanks.
next prev parent reply other threads:[~2017-04-19 1:28 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-18 21:57 [PATCH v3 0/2] gethostbyname fixes David Turner
2017-04-18 21:57 ` [PATCH v3 1/2] use HOST_NAME_MAX to size buffers for gethostname(2) David Turner
2017-04-19 1:28 ` Jonathan Nieder [this message]
2017-04-19 2:57 ` Junio C Hamano
2017-04-19 14:03 ` René Scharfe
2017-04-19 17:28 ` René Scharfe
2017-04-19 19:08 ` David Turner
2017-04-19 19:09 ` Torsten Bögershausen
2017-04-19 20:02 ` René Scharfe
2017-04-20 18:37 ` Torsten Bögershausen
2017-04-20 19:28 ` René Scharfe
2017-04-21 4:18 ` Torsten Bögershausen
2017-04-18 21:57 ` [PATCH v3 2/2] xgethostname: handle long hostnames David Turner
2017-04-19 1:35 ` Jonathan Nieder
2017-04-19 2:51 ` Junio C Hamano
2017-04-19 15:50 ` David Turner
2017-04-19 16:43 ` René Scharfe
2017-04-19 2:48 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170419012824.GA28740@aiede.svl.corp.google.com \
--to=jrnieder@gmail.com \
--cc=dturner@twosigma.com \
--cc=git@vger.kernel.org \
--cc=l.s.r@web.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).