diff options
| author | Tom Lane | 2014-02-17 16:20:35 +0000 |
|---|---|---|
| committer | Tom Lane | 2014-02-17 16:20:35 +0000 |
| commit | 45bf2404a2f586a35e8647890a7d5917b787a623 (patch) | |
| tree | 74885ce0a3dec6e273f914ac6b1853aa9af2daaa /src/timezone | |
| parent | 2c3203e18551343db11ed9d372cd2a25d65d3f35 (diff) | |
Prevent potential overruns of fixed-size buffers.
Coverity identified a number of places in which it couldn't prove that a
string being copied into a fixed-size buffer would fit. We believe that
most, perhaps all of these are in fact safe, or are copying data that is
coming from a trusted source so that any overrun is not really a security
issue. Nonetheless it seems prudent to forestall any risk by using
strlcpy() and similar functions.
Fixes by Peter Eisentraut and Jozef Mlich based on Coverity reports.
In addition, fix a potential null-pointer-dereference crash in
contrib/chkpass. The crypt(3) function is defined to return NULL on
failure, but chkpass.c didn't check for that before using the result.
The main practical case in which this could be an issue is if libc is
configured to refuse to execute unapproved hashing algorithms (e.g.,
"FIPS mode"). This ideally should've been a separate commit, but
since it touches code adjacent to one of the buffer overrun changes,
I included it in this commit to avoid last-minute merge issues.
This issue was reported by Honza Horak.
Security: CVE-2014-0065 for buffer overruns, CVE-2014-0066 for crypt()
Diffstat (limited to 'src/timezone')
| -rw-r--r-- | src/timezone/pgtz.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/timezone/pgtz.c b/src/timezone/pgtz.c index 13e3bf19440..e286c1178c2 100644 --- a/src/timezone/pgtz.c +++ b/src/timezone/pgtz.c @@ -94,7 +94,7 @@ pg_open_tzfile(const char *name, char *canonname) * Loop to split the given name into directory levels; for each level, * search using scan_directory_ci(). */ - strcpy(fullname, pg_TZDIR()); + strlcpy(fullname, pg_TZDIR(), sizeof(fullname)); orignamelen = fullnamelen = strlen(fullname); fname = name; for (;;) @@ -428,7 +428,7 @@ identify_system_timezone(void) } /* Search for the best-matching timezone file */ - strcpy(tmptzdir, pg_TZDIR()); + strlcpy(tmptzdir, pg_TZDIR(), sizeof(tmptzdir)); bestscore = -1; resultbuf[0] = '\0'; scan_available_timezones(tmptzdir, tmptzdir + strlen(tmptzdir) + 1, |