aboutsummaryrefslogtreecommitdiff
path: root/contrib/tzcode
diff options
context:
space:
mode:
authorEdward Tomasz Napierala <trasz@FreeBSD.org>2018-10-30 15:43:06 +0000
committerEdward Tomasz Napierala <trasz@FreeBSD.org>2018-10-30 15:43:06 +0000
commit02ba1d993fa905b059fc044cac30123f6e29ad38 (patch)
tree2b66e20228e1de6b5905120ed00508c0e97fafa2 /contrib/tzcode
parent323d76db47bf310bb0602daf89278a7e90f49c5e (diff)
downloadsrc-02ba1d993fa905b059fc044cac30123f6e29ad38.tar.gz
src-02ba1d993fa905b059fc044cac30123f6e29ad38.zip
Remove useless call to access(2) from tzcode. Quoting OpenBSD:
> Remove doaccess variable and access(2) call since this interfers with > applications like zdump(8) because pledge(2) doesn't allow access(2) to > /usr/share/zoneinfo. > > millert@ better described why this call can go away: > > "This looks like an attempt to do access checks based on the real uid instead > of the effective uid. Basically for setuid programs we don't want to allow a > user to set TZ to a path they should not be able to otherwise access. > > However, we already have a check for issetugid() above so I think the doaccess > bits can just be removed and we can rely on open()." > > After discussion with tb@, deraadt@ and millert@, this was also OK'ed by them Reviewed by: imp Obtained from: OpenBSD MFC after: 2 weeks Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D17701
Notes
Notes: svn path=/head/; revision=339920
Diffstat (limited to 'contrib/tzcode')
-rw-r--r--contrib/tzcode/stdtime/localtime.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/contrib/tzcode/stdtime/localtime.c b/contrib/tzcode/stdtime/localtime.c
index 632a8d4a89ba..009136de7031 100644
--- a/contrib/tzcode/stdtime/localtime.c
+++ b/contrib/tzcode/stdtime/localtime.c
@@ -398,7 +398,6 @@ register const int doextend;
if (name == NULL && (name = TZDEFAULT) == NULL)
return -1;
{
- int doaccess;
struct stat stab;
/*
** Section 4.9.1 of the C standard says that
@@ -415,8 +414,7 @@ register const int doextend;
if (name[0] == ':')
++name;
- doaccess = name[0] == '/';
- if (!doaccess) {
+ if (name[0] != '/') {
if ((p = TZDIR) == NULL) {
free(fullname);
return -1;
@@ -428,17 +426,8 @@ register const int doextend;
(void) strcpy(fullname, p);
(void) strcat(fullname, "/");
(void) strcat(fullname, name);
- /*
- ** Set doaccess if '.' (as in "../") shows up in name.
- */
- if (strchr(name, '.') != NULL)
- doaccess = TRUE;
name = fullname;
}
- if (doaccess && access(name, R_OK) != 0) {
- free(fullname);
- return -1;
- }
if ((fid = _open(name, OPEN_MODE)) == -1) {
free(fullname);
return -1;