forked from coolsnowwolf/lede
-
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.
[bot] AutoMerging: merge all upstream's changes:
* https://github.com/coolsnowwolf/lede: rockchip: unlock rk3568 cpu freq 2.0Ghz uboot-rockchip: refresh rk3328 rkbin verdor atf (coolsnowwolf#9903) target: add silicon mk place holder uboot-rockchip: add rk3568 board support arm-trusted-firmware-rockchip-vendor: add rk3568/rk3588 rkbin verdor atf arm-trusted-firmware-rockchip-vendor: bump to v2022-08-01 phy: update RK3568 rockchip-snps-pcie3 fw when init zlib: backport fix for heap-based buffer over-read (CVE-2022-37434) generic: 5.15: disable CONFIG_DEBUG_INFO_REDUCED symbol
- Loading branch information
Showing
10 changed files
with
8,420 additions
and
19 deletions.
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
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
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
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,32 @@ | ||
| From eff308af425b67093bab25f80f1ae950166bece1 Mon Sep 17 00:00:00 2001 | ||
| From: Mark Adler <fork@madler.net> | ||
| Date: Sat, 30 Jul 2022 15:51:11 -0700 | ||
| Subject: [PATCH] Fix a bug when getting a gzip header extra field with | ||
| inflate(). | ||
|
|
||
| If the extra field was larger than the space the user provided with | ||
| inflateGetHeader(), and if multiple calls of inflate() delivered | ||
| the extra header data, then there could be a buffer overflow of the | ||
| provided space. This commit assures that provided space is not | ||
| exceeded. | ||
| --- | ||
| inflate.c | 5 +++-- | ||
| 1 file changed, 3 insertions(+), 2 deletions(-) | ||
|
|
||
| diff --git a/inflate.c b/inflate.c | ||
| index 7be8c6366..7a7289749 100644 | ||
| --- a/inflate.c | ||
| +++ b/inflate.c | ||
| @@ -763,9 +763,10 @@ int flush; | ||
| copy = state->length; | ||
| if (copy > have) copy = have; | ||
| if (copy) { | ||
| + len = state->head->extra_len - state->length; | ||
| if (state->head != Z_NULL && | ||
| - state->head->extra != Z_NULL) { | ||
| - len = state->head->extra_len - state->length; | ||
| + state->head->extra != Z_NULL && | ||
| + len < state->head->extra_max) { | ||
| zmemcpy(state->head->extra + len, next, | ||
| len + copy > state->head->extra_max ? | ||
| state->head->extra_max - len : copy); |
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
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
Oops, something went wrong.