Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix integer overflow on windows #4589

Merged
merged 1 commit into from Nov 18, 2020
Merged

Fix integer overflow on windows #4589

merged 1 commit into from Nov 18, 2020

Conversation

cpuguy83
Copy link
Member

You can test this by doing:

make binaries GOOS=windows GOARCH=arm

Before this there are compiler errors due to integer overflows.

@theopenlab-ci
Copy link

theopenlab-ci bot commented Sep 28, 2020

Build succeeded.

dmcgowan
dmcgowan approved these changes Sep 28, 2020
View reviewed changes
Copy link
Member

@dmcgowan dmcgowan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@thaJeztah
Copy link
Member

curious; is this something that can/should be fixed in golang.org/x/sys? (I'd somewhat expect the constant to have the right type to be used)

thaJeztah
thaJeztah approved these changes Sep 28, 2020
View reviewed changes
Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@fuweid
Copy link
Member

fuweid commented Sep 29, 2020

Something wrong in the pipeline about macos.

GOGC=75 golangci-lint run
level=error msg="Timeout exceeded: try increasing it by passing --timeout option"
make: *** [check] Error 4

@kzys
Copy link
Member

kzys commented Nov 16, 2020

We can merge the change since there are three approvals. I'm not so sure what was wrong with the macos test. Can we re-run the test by rebasing this branch?

@cpuguy83
Fix integer overflow on windows
bd7c6ca 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
@theopenlab-ci
Copy link

theopenlab-ci bot commented Nov 16, 2020

Build succeeded.

@mxpv mxpv merged commit 25e4774 into containerd:master Nov 18, 2020
@cpuguy83 cpuguy83 deleted the windows_int_overflow branch November 18, 2020 20:40
This was referenced Nov 18, 2020
Merged
Merged
@fuweid fuweid added cherry-picked/1.3.x cherry-picked/1.4.x PR commits are cherry picked into the release/1.4 branch labels Nov 19, 2020
thaJeztah added a commit to thaJeztah/containerd-packaging that referenced this pull request Nov 26, 2020
@thaJeztah
release 1.4.2
167ea7f 
- Update to containerd 1.4.2
- Update Golang runtime to 1.15.5

Upstream containerd 1.4.2 release notes: https://github.com/containerd/containerd/releases/tag/v1.4.2

Welcome to the v1.4.2 release of containerd!
------------------------------------------------------

The second patch release for containerd 1.4 includes multiple minor fixes
and updates.

Notable Updates

- Fix bug limiting the number of layers by default containerd/cri#1602
- Fix selinux shared memory issue by relabeling /dev/shm containerd/cri#1605
- Fix unknown state preventing removal of containers containerd/containerd#4656
- Fix nil pointer error when restoring checkpoint containerd/containerd#4754
- Improve image pull performance when using HTTP 1.1 containerd/containerd#4653
- Update default seccomp profile for pidfd containerd/containerd#4730
- Update Go to 1.15

Windows

- Fix integer overflow on Windows containerd/containerd#4589
- Fix lcow snapshotter to read trailing tar data containerd/containerd#4628

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah mentioned this pull request Nov 26, 2020
Merged
thaJeztah added a commit to thaJeztah/docker that referenced this pull request Nov 26, 2020
@thaJeztah
update containerd binary to v1.4.2
7039511 
NOTE: the Dockerfile currently uses a single version of Golang for all
      stages. This means that currently, all binaries are built with Go
      1.13.x, including the containerd binary; upstream containerd switched
      to use Go 1.15.

full diff: containerd/containerd@v1.4.1...v1.4.2

Release notes:

Welcome to the v1.4.2 release of containerd!
------------------------------------------------------

The second patch release for containerd 1.4 includes multiple minor fixes
and updates.

Notable Updates

- Fix bug limiting the number of layers by default containerd/cri#1602
- Fix selinux shared memory issue by relabeling /dev/shm containerd/cri#1605
- Fix unknown state preventing removal of containers containerd/containerd#4656
- Fix nil pointer error when restoring checkpoint containerd/containerd#4754
- Improve image pull performance when using HTTP 1.1 containerd/containerd#4653
- Update default seccomp profile for pidfd containerd/containerd#4730
- Update Go to 1.15

Windows

- Fix integer overflow on Windows containerd/containerd#4589
- Fix lcow snapshotter to read trailing tar data containerd/containerd#4628

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah mentioned this pull request Nov 26, 2020
Merged
docker-jenkins pushed a commit to docker/docker-ce that referenced this pull request Nov 30, 2020
@thaJeztah
update containerd binary to v1.4.2
b87f0d4 
NOTE: the Dockerfile currently uses a single version of Golang for all
      stages. This means that currently, all binaries are built with Go
      1.13.x, including the containerd binary; upstream containerd switched
      to use Go 1.15.

full diff: containerd/containerd@v1.4.1...v1.4.2

Release notes:

Welcome to the v1.4.2 release of containerd!
------------------------------------------------------

The second patch release for containerd 1.4 includes multiple minor fixes
and updates.

Notable Updates

- Fix bug limiting the number of layers by default containerd/cri#1602
- Fix selinux shared memory issue by relabeling /dev/shm containerd/cri#1605
- Fix unknown state preventing removal of containers containerd/containerd#4656
- Fix nil pointer error when restoring checkpoint containerd/containerd#4754
- Improve image pull performance when using HTTP 1.1 containerd/containerd#4653
- Update default seccomp profile for pidfd containerd/containerd#4730
- Update Go to 1.15

Windows

- Fix integer overflow on Windows containerd/containerd#4589
- Fix lcow snapshotter to read trailing tar data containerd/containerd#4628

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 703951197c3338631ee0529dd9dd814d16f037f0
Component: engine
thaJeztah added a commit to thaJeztah/containerd-packaging that referenced this pull request Dec 2, 2020
@thaJeztah
release 1.4.2
9ae2b85 
- Update to containerd 1.4.2
- Update Golang runtime to 1.15.5

Upstream containerd 1.4.2 release notes: https://github.com/containerd/containerd/releases/tag/v1.4.2

Welcome to the v1.4.2 release of containerd!
------------------------------------------------------

The second patch release for containerd 1.4 includes multiple minor fixes
and updates.

Notable Updates

- Fix bug limiting the number of layers by default containerd/cri#1602
- Fix selinux shared memory issue by relabeling /dev/shm containerd/cri#1605
- Fix unknown state preventing removal of containers containerd/containerd#4656
- Fix nil pointer error when restoring checkpoint containerd/containerd#4754
- Improve image pull performance when using HTTP 1.1 containerd/containerd#4653
- Update default seccomp profile for pidfd containerd/containerd#4730
- Update Go to 1.15

Windows

- Fix integer overflow on Windows containerd/containerd#4589
- Fix lcow snapshotter to read trailing tar data containerd/containerd#4628

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah added a commit to thaJeztah/docker that referenced this pull request Feb 12, 2021
@thaJeztah
update containerd binary to v1.4.2
d63e258 
NOTE: the Dockerfile currently uses a single version of Golang for all
      stages. This means that currently, all binaries are built with Go
      1.13.x, including the containerd binary; upstream containerd switched
      to use Go 1.15.

full diff: containerd/containerd@v1.4.1...v1.4.2

Release notes:

Welcome to the v1.4.2 release of containerd!
------------------------------------------------------

The second patch release for containerd 1.4 includes multiple minor fixes
and updates.

Notable Updates

- Fix bug limiting the number of layers by default containerd/cri#1602
- Fix selinux shared memory issue by relabeling /dev/shm containerd/cri#1605
- Fix unknown state preventing removal of containers containerd/containerd#4656
- Fix nil pointer error when restoring checkpoint containerd/containerd#4754
- Improve image pull performance when using HTTP 1.1 containerd/containerd#4653
- Update default seccomp profile for pidfd containerd/containerd#4730
- Update Go to 1.15

Windows

- Fix integer overflow on Windows containerd/containerd#4589
- Fix lcow snapshotter to read trailing tar data containerd/containerd#4628

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 7039511)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dmcgowan dmcgowan dmcgowan approved these changes

@mxpv mxpv mxpv approved these changes

@thaJeztah thaJeztah thaJeztah approved these changes

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

@jterry75 jterry75 Awaiting requested review from jterry75

Assignees
No one assigned
Labels
cherry-picked/1.4.x PR commits are cherry picked into the release/1.4 branch
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@cpuguy83 @thaJeztah @fuweid @kzys @dmcgowan @mxpv @AkihiroSuda