Merge pull request #101335 from joelsmith/automated-cherry-pick-of-#1…

…01306-upstream-release-1.18 [1.18] Automated cherry pick of #101306: Additional CVE-2021-3121 fix
kubernetes · Apr 21, 2021 · 3d47d83 · 3d47d83
2 parents a5d842b + a9e1294
commit 3d47d83
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/staging/src/k8s.io/apimachinery/pkg/api/resource/quantity_proto.go b/staging/src/k8s.io/apimachinery/pkg/api/resource/quantity_proto.go
@@ -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 {