forked from microsoft/azurelinux
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Patch packer for CVE-2024-28180 [Medium] (microsoft#12153)
Co-authored-by: jslobodzian <joslobo@microsoft.com>
- Loading branch information
1 parent
50cc1fa
commit 37b311c
Showing
2 changed files
with
93 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,88 @@ | ||
From e7117826d5632d069fb10ebac993b1c888684100 Mon Sep 17 00:00:00 2001 | ||
From: Kanishk Bansal <kbkanishk975@gmail.com> | ||
Date: Thu, 30 Jan 2025 18:37:37 +0000 | ||
Subject: [PATCH] Address CVE-2024-28180 for packer | ||
|
||
--- | ||
vendor/gopkg.in/square/go-jose.v2/crypter.go | 6 ++++++ | ||
vendor/gopkg.in/square/go-jose.v2/encoding.go | 20 +++++++++++++++---- | ||
2 files changed, 22 insertions(+), 4 deletions(-) | ||
|
||
diff --git a/vendor/gopkg.in/square/go-jose.v2/crypter.go b/vendor/gopkg.in/square/go-jose.v2/crypter.go | ||
index be7433e..763eae0 100644 | ||
--- a/vendor/gopkg.in/square/go-jose.v2/crypter.go | ||
+++ b/vendor/gopkg.in/square/go-jose.v2/crypter.go | ||
@@ -406,6 +406,9 @@ func (ctx *genericEncrypter) Options() EncrypterOptions { | ||
// Decrypt and validate the object and return the plaintext. Note that this | ||
// function does not support multi-recipient, if you desire multi-recipient | ||
// decryption use DecryptMulti instead. | ||
+// | ||
+// Automatically decompresses plaintext, but returns an error if the decompressed | ||
+// data would be >250kB or >10x the size of the compressed data, whichever is larger. | ||
func (obj JSONWebEncryption) Decrypt(decryptionKey interface{}) ([]byte, error) { | ||
headers := obj.mergedHeaders(nil) | ||
|
||
@@ -470,6 +473,9 @@ func (obj JSONWebEncryption) Decrypt(decryptionKey interface{}) ([]byte, error) | ||
// with support for multiple recipients. It returns the index of the recipient | ||
// for which the decryption was successful, the merged headers for that recipient, | ||
// and the plaintext. | ||
+// | ||
+// Automatically decompresses plaintext, but returns an error if the decompressed | ||
+// data would be >250kB or >3x the size of the compressed data, whichever is larger. | ||
func (obj JSONWebEncryption) DecryptMulti(decryptionKey interface{}) (int, Header, []byte, error) { | ||
globalHeaders := obj.mergedHeaders(nil) | ||
|
||
diff --git a/vendor/gopkg.in/square/go-jose.v2/encoding.go b/vendor/gopkg.in/square/go-jose.v2/encoding.go | ||
index 70f7385..2b92116 100644 | ||
--- a/vendor/gopkg.in/square/go-jose.v2/encoding.go | ||
+++ b/vendor/gopkg.in/square/go-jose.v2/encoding.go | ||
@@ -21,6 +21,7 @@ import ( | ||
"compress/flate" | ||
"encoding/base64" | ||
"encoding/binary" | ||
+ "fmt" | ||
"io" | ||
"math/big" | ||
"strings" | ||
@@ -85,7 +86,7 @@ func decompress(algorithm CompressionAlgorithm, input []byte) ([]byte, error) { | ||
} | ||
} | ||
|
||
-// Compress with DEFLATE | ||
+// deflate compresses the input. | ||
func deflate(input []byte) ([]byte, error) { | ||
output := new(bytes.Buffer) | ||
|
||
@@ -97,15 +98,26 @@ func deflate(input []byte) ([]byte, error) { | ||
return output.Bytes(), err | ||
} | ||
|
||
-// Decompress with DEFLATE | ||
+// inflate decompresses the input. | ||
+// | ||
+// Errors if the decompressed data would be >250kB or >10x the size of the | ||
+// compressed data, whichever is larger. | ||
func inflate(input []byte) ([]byte, error) { | ||
output := new(bytes.Buffer) | ||
reader := flate.NewReader(bytes.NewBuffer(input)) | ||
|
||
- _, err := io.Copy(output, reader) | ||
- if err != nil { | ||
+ maxCompressedSize := 10 * int64(len(input)) | ||
+ if maxCompressedSize < 250000 { | ||
+ maxCompressedSize = 250000 | ||
+ } | ||
+ limit := maxCompressedSize + 1 | ||
+ n, err := io.CopyN(output, reader, limit) | ||
+ if err != nil && err != io.EOF { | ||
return nil, err | ||
} | ||
+ if n == limit { | ||
+ return nil, fmt.Errorf("uncompressed data would be too large (>%d bytes)", maxCompressedSize) | ||
+ } | ||
|
||
err = reader.Close() | ||
return output.Bytes(), err | ||
-- | ||
2.43.0 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters