diff options
| author | Cindy Pallares <cindy@gitlab.com> | 2018-11-28 22:03:55 +0300 |
|---|---|---|
| committer | Cindy Pallares <cindy@gitlab.com> | 2018-11-29 03:09:45 +0300 |
| commit | ffd1c4cd453043448198d4a1c9582f5c54f5c377 (patch) | |
| tree | d695d00d393dc4b63a5b497ea73b5656b74aca8c | |
| parent | b5b475c273aca6aee13f628507cef9f077281a02 (diff) | |
Merge branch 'security-pages-toctou-race' into 'master'
[master] [pages] Possible symlink time of check to time of use race condition
Closes #2742
See merge request gitlab/gitlabhq!2638
| -rw-r--r-- | GITLAB_PAGES_VERSION | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/security-pages-toctou-race.yml | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/GITLAB_PAGES_VERSION b/GITLAB_PAGES_VERSION index f0bb29e7638..3a3cd8cc8b0 100644 --- a/GITLAB_PAGES_VERSION +++ b/GITLAB_PAGES_VERSION @@ -1 +1 @@ -1.3.0 +1.3.1 diff --git a/changelogs/unreleased/security-pages-toctou-race.yml b/changelogs/unreleased/security-pages-toctou-race.yml new file mode 100644 index 00000000000..1c055f6087f --- /dev/null +++ b/changelogs/unreleased/security-pages-toctou-race.yml @@ -0,0 +1,6 @@ +--- +title: Fix a possible symlink time of check to time of use race condition in GitLab + Pages +merge_request: +author: +type: security |