From 4cf5e9e918c5b1997430aa6c6ea6e7d21ea96cfa Mon Sep 17 00:00:00 2001 From: c00346986 Date: Thu, 20 Aug 2020 20:55:21 +0800 Subject: [PATCH] Revert "TicketNo:DTS2020080802733" This reverts commit b96246c57c9c3bfba7f6eeeacc84adda602fc933. Change-Id: Ica8da9e977b05625aa4f3173e5e42a97a49d8e60 Reviewed-on: http://mgit-tm.rnd.huawei.com/10360347 Reviewed-by: liulei 00510663 Reviewed-by: lihao 00517597 Tested-by: public jenkins Reviewed-by: zhaopeng 00380337 --- arch/arm/bits/fcntl.h | 2 -- kernel/arch/arm/bits/fcntl.h | 2 -- ldso/dynlink.c | 4 ++-- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/arch/arm/bits/fcntl.h b/arch/arm/bits/fcntl.h index 4518fdc5..4cb1753b 100644 --- a/arch/arm/bits/fcntl.h +++ b/arch/arm/bits/fcntl.h @@ -19,8 +19,6 @@ #define O_TMPFILE 020040000 #define O_NDELAY O_NONBLOCK -#define O_ELFFILE 040 - #define F_DUPFD 0 #define F_GETFD 1 #define F_SETFD 2 diff --git a/kernel/arch/arm/bits/fcntl.h b/kernel/arch/arm/bits/fcntl.h index 86766ceb..472cd519 100644 --- a/kernel/arch/arm/bits/fcntl.h +++ b/kernel/arch/arm/bits/fcntl.h @@ -24,8 +24,6 @@ #define O_EXECVE 040000000 -#define O_ELFFILE 040 - #define F_DUPFD 0 #define F_GETFD 1 #define F_SETFD 2 diff --git a/ldso/dynlink.c b/ldso/dynlink.c index 37e080a2..e938fce0 100644 --- a/ldso/dynlink.c +++ b/ldso/dynlink.c @@ -812,7 +812,7 @@ static int path_open(const char *name, const char *s, char *buf, size_t buf_size l = strcspn(s, ":\n"); if (l-1 >= INT_MAX) return -1; if (snprintf(buf, buf_size, "%.*s/%s", (int)l, s, name) < buf_size) { - if ((fd = open(buf, O_RDONLY | O_ELFFILE))>=0) return fd; // open(buf, O_RDONLY|O_CLOEXEC) + if ((fd = open(buf, O_RDONLY))>=0) return fd; // open(buf, O_RDONLY|O_CLOEXEC) switch (errno) { case ENOENT: case ENOTDIR: @@ -1040,7 +1040,7 @@ static struct dso *load_library(const char *name, struct dso *needed_by) } if (strchr(name, '/')) { pathname = name; - fd = open(name, O_RDONLY | O_ELFFILE); // open(name, O_RDONLY|O_CLOEXEC); + fd = open(name, O_RDONLY); // open(name, O_RDONLY|O_CLOEXEC); } else { /* Search for the name to see if it's already loaded */ for (p=head->next; p; p=p->next) { -- GitLab