upstream/kubernetes
1
0
Fork 0
mirror of https://github.com/kubernetes/kubernetes.git synced 2026-05-28 04:04:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #101327 from joelsmith/automated-cherry-pick-of-#101306-upstream-release-1.19

Browse source 
[1.19] Automated cherry pick of #101306: Additional CVE-2021-3121 fix
This commit is contained in:
Kubernetes Prow Robot 2021-04-21 12:05:51 -07:00 committed by GitHub
commit 3e8d456f2b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
staging/src/k8s.io/apimachinery/pkg/api/resource/quantity_proto.go
View file

@ -166,7 +166,7 @@ func (m *Quantity) Unmarshal(data []byte) error {
if err != nil {
return err
}
if skippy < 0 {
if (skippy < 0) || (iNdEx+skippy) < 0 {
return ErrInvalidLengthGenerated
}
if (iNdEx + skippy) > l {