diff options
| author | Florian Franzmann | 2019-12-21 15:47:13 +0100 |
|---|---|---|
| committer | Florian Franzmann | 2019-12-22 01:15:11 +0100 |
| commit | 62eb1f5393be9436555853eaef6b83724b53e2be (patch) | |
| tree | 8138e7e9d238ee1252822c07de8130e2b6eb915c /smgl | |
| parent | cd6f108ca93e040ce1ebbc01fc40bc4b004091fe (diff) | |
smgl/castfs: fix error triggered by -D_FORTIFY_SOURCE=2
Diffstat (limited to 'smgl')
| -rw-r--r-- | smgl/castfs/0001-Fix-error-triggered-by-D_FORTIFY_SOURCE-2.patch | 27 | ||||
| -rw-r--r-- | smgl/castfs/HISTORY | 4 | ||||
| -rwxr-xr-x | smgl/castfs/PRE_BUILD | 2 |
3 files changed, 33 insertions, 0 deletions
diff --git a/smgl/castfs/0001-Fix-error-triggered-by-D_FORTIFY_SOURCE-2.patch b/smgl/castfs/0001-Fix-error-triggered-by-D_FORTIFY_SOURCE-2.patch new file mode 100644 index 0000000000..0435127c7b --- /dev/null +++ b/smgl/castfs/0001-Fix-error-triggered-by-D_FORTIFY_SOURCE-2.patch @@ -0,0 +1,27 @@ +From 556dc2c99043a35da0695bb7cfb70d25a2f0accf Mon Sep 17 00:00:00 2001 +From: Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> +Date: Sat, 21 Dec 2019 15:43:45 +0100 +Subject: [PATCH] Fix error triggered by -D_FORTIFY_SOURCE=2 + +open() should only be called in its three-parameter form if O_CREAT is +used. +--- + src/utils.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/utils.c b/src/utils.c +index 1e1af79..e678756 100644 +--- a/src/utils.c ++++ b/src/utils.c +@@ -62,7 +62,7 @@ int cast_copy_reg_file(const char *from, const char *to) + ffd = open(from, O_RDONLY); + if (ffd < 0) + return -errno; +- tfd = open(to, O_WRONLY | O_TRUNC | O_CREAT); ++ tfd = open(to, S_IRUSR | S_IWUSR, O_WRONLY | O_TRUNC | O_CREAT); + if (tfd < 0) + return -errno; + while (rsize > 0) { +-- +2.24.1 + diff --git a/smgl/castfs/HISTORY b/smgl/castfs/HISTORY index 911246efba..4971c5dccb 100644 --- a/smgl/castfs/HISTORY +++ b/smgl/castfs/HISTORY @@ -1,3 +1,7 @@ +2019-12-21 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> + * PRE_BUILD, 0001-Fix-error-triggered-by-D_FORTIFY_SOURCE-2.patch: fix + error triggered by -D_FORTIFY_SOURCE=2 + 2015-03-28 Vlad Glagolev <stealth@sourcemage.org> * PRE_BUILD: readded, for scm branch diff --git a/smgl/castfs/PRE_BUILD b/smgl/castfs/PRE_BUILD index e7a0c04b70..e89ef15735 100755 --- a/smgl/castfs/PRE_BUILD +++ b/smgl/castfs/PRE_BUILD @@ -1,6 +1,8 @@ default_pre_build && cd "$SOURCE_DIRECTORY" && +patch -p1 < "$SPELL_DIRECTORY/0001-Fix-error-triggered-by-D_FORTIFY_SOURCE-2.patch" && + if [[ $CASTFS_BRANCH == scm ]]; then ./autogen.sh fi |