Skip to content

[release/1.0] archive: check whiteout path before removal#2003

Merged
stevvooe merged 1 commit intocontainerd:release/1.0from
dmcgowan:cherry-pick-fix-whiteout-rootpath-1.0
Jan 13, 2018
Merged

[release/1.0] archive: check whiteout path before removal#2003
stevvooe merged 1 commit intocontainerd:release/1.0from
dmcgowan:cherry-pick-fix-whiteout-rootpath-1.0

Conversation

@dmcgowan
Copy link
Copy Markdown
Member

Cherry pick of #2001

Ensure whiteout is not pointing to the current directory
or parent directory before removing. Protects against invalid
removal of the parent or current directory.

Add whiteout related tar tests using manufactured tar conditions.

Ensure whiteout is not pointing to the current directory
or parent directory before removing. Protects against invalid
removal of the parent or current directory.

Add whiteout related tar tests using manufactured tar conditions.

Signed-off-by: Derek McGowan <[email protected]>
@codecov-io
Copy link
Copy Markdown

Codecov Report

Merging #2003 into release/1.0 will increase coverage by 0.02%.
The diff coverage is 100%.

Impacted file tree graph

@@               Coverage Diff               @@
##           release/1.0    #2003      +/-   ##
===============================================
+ Coverage        50.54%   50.57%   +0.02%     
===============================================
  Files               81       81              
  Lines             7136     7140       +4     
===============================================
+ Hits              3607     3611       +4     
  Misses            2838     2838              
  Partials           691      691
Flag Coverage Δ
#linux 50.57% <100%> (+0.02%) ⬆️
Impacted Files Coverage Δ
archive/tar.go 50.76% <100%> (+0.6%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1549dda...ce75ddf. Read the comment docs.

@crosbymichael
Copy link
Copy Markdown
Member

LGTM

1 similar comment
@stevvooe
Copy link
Copy Markdown
Member

LGTM

@stevvooe stevvooe merged commit 0a2c2a2 into containerd:release/1.0 Jan 13, 2018
@stevvooe stevvooe added this to the 1.0.1 milestone Jan 13, 2018
@dmcgowan dmcgowan deleted the cherry-pick-fix-whiteout-rootpath-1.0 branch September 10, 2019 17:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants