diff options
author | Trevor Gamblin <trevor.gamblin@windriver.com> | 2019-10-03 14:58:50 -0400 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-10-04 19:11:55 -0700 |
commit | ec48bd3bdfa4db779734417d3866b8437a9470e6 (patch) | |
tree | 7cda0380d9283db8be7288fae9124baef12fba56 /meta-oe/recipes-devtools | |
parent | b750c405c7d291a885b8ceb197fe59b2ce125d11 (diff) | |
download | meta-openembedded-ec48bd3bdfa4db779734417d3866b8437a9470e6.tar.gz |
php: fix CVE-2019-6978
Patch for php to sync with the fix for the same issue in
libgd.
CVE: CVE-2019-6978
Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools')
-rw-r--r-- | meta-oe/recipes-devtools/php/php/CVE-2019-6978.patch | 192 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/php/php_7.3.9.bb | 1 |
2 files changed, 193 insertions, 0 deletions
diff --git a/meta-oe/recipes-devtools/php/php/CVE-2019-6978.patch b/meta-oe/recipes-devtools/php/php/CVE-2019-6978.patch new file mode 100644 index 000000000..b7cdfd964 --- /dev/null +++ b/meta-oe/recipes-devtools/php/php/CVE-2019-6978.patch | |||
@@ -0,0 +1,192 @@ | |||
1 | From 089f7c0bc28d399b0420aa6ef058e4c1c120b2ae Mon Sep 17 00:00:00 2001 | ||
2 | From: "Christoph M. Becker" <cmbecker69@gmx.de> | ||
3 | Date: Sat, 19 Jan 2019 10:35:39 +0100 | ||
4 | Subject: [PATCH] Sync with upstream | ||
5 | |||
6 | Even though libgd/libgd#492 is not a relevant bug fix for PHP, since | ||
7 | the binding doesn't use the `gdImage*Ptr()` functions at all, we're | ||
8 | porting the fix to stay in sync here. | ||
9 | --- | ||
10 | ext/gd/libgd/gd_gif_out.c | 20 +++++++++++++++++--- | ||
11 | ext/gd/libgd/gd_jpeg.c | 17 ++++++++++++++--- | ||
12 | ext/gd/libgd/gd_wbmp.c | 18 +++++++++++++++--- | ||
13 | 3 files changed, 46 insertions(+), 9 deletions(-) | ||
14 | |||
15 | Upstream-Status: Backport [http://git.php.net/?p=php-src.git;a=commit;h=089f7c0bc28d399b0420aa6ef058e4c1c120b2ae] | ||
16 | CVE: CVE-2019-6978 | ||
17 | |||
18 | Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com> | ||
19 | |||
20 | diff --git a/ext/gd/libgd/gd_gif_out.c b/ext/gd/libgd/gd_gif_out.c | ||
21 | index 1f2a6b936a..2e1f38af70 100644 | ||
22 | --- a/ext/gd/libgd/gd_gif_out.c | ||
23 | +++ b/ext/gd/libgd/gd_gif_out.c | ||
24 | @@ -97,12 +97,18 @@ static void cl_hash (register count_int chsize, GifCtx *ctx); | ||
25 | static void char_init (GifCtx *ctx); | ||
26 | static void char_out (int c, GifCtx *ctx); | ||
27 | static void flush_char (GifCtx *ctx); | ||
28 | + | ||
29 | +static int _gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out); | ||
30 | + | ||
31 | void * gdImageGifPtr (gdImagePtr im, int *size) | ||
32 | { | ||
33 | void *rv; | ||
34 | gdIOCtx *out = gdNewDynamicCtx (2048, NULL); | ||
35 | - gdImageGifCtx (im, out); | ||
36 | - rv = gdDPExtractData (out, size); | ||
37 | + if (!_gdImageGifCtx(im, out)) { | ||
38 | + rv = gdDPExtractData(out, size); | ||
39 | + } else { | ||
40 | + rv = NULL; | ||
41 | + } | ||
42 | out->gd_free (out); | ||
43 | return rv; | ||
44 | } | ||
45 | @@ -115,6 +121,12 @@ void gdImageGif (gdImagePtr im, FILE * outFile) | ||
46 | } | ||
47 | |||
48 | void gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out) | ||
49 | +{ | ||
50 | + _gdImageGifCtx(im, out); | ||
51 | +} | ||
52 | + | ||
53 | +/* returns 0 on success, 1 on failure */ | ||
54 | +static int _gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out) | ||
55 | { | ||
56 | gdImagePtr pim = 0, tim = im; | ||
57 | int interlace, BitsPerPixel; | ||
58 | @@ -125,7 +137,7 @@ void gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out) | ||
59 | based temporary image. */ | ||
60 | pim = gdImageCreatePaletteFromTrueColor(im, 1, 256); | ||
61 | if (!pim) { | ||
62 | - return; | ||
63 | + return 1; | ||
64 | } | ||
65 | tim = pim; | ||
66 | } | ||
67 | @@ -138,6 +150,8 @@ void gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out) | ||
68 | /* Destroy palette based temporary image. */ | ||
69 | gdImageDestroy( pim); | ||
70 | } | ||
71 | + | ||
72 | + return 0; | ||
73 | } | ||
74 | |||
75 | static int | ||
76 | diff --git a/ext/gd/libgd/gd_jpeg.c b/ext/gd/libgd/gd_jpeg.c | ||
77 | index 8cf71fcbc9..ef46c4a22c 100644 | ||
78 | --- a/ext/gd/libgd/gd_jpeg.c | ||
79 | +++ b/ext/gd/libgd/gd_jpeg.c | ||
80 | @@ -132,6 +132,7 @@ const char * gdJpegGetVersionString() | ||
81 | } | ||
82 | } | ||
83 | |||
84 | +static int _gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality); | ||
85 | |||
86 | /* | ||
87 | * Write IM to OUTFILE as a JFIF-formatted JPEG image, using quality | ||
88 | @@ -153,8 +154,11 @@ void *gdImageJpegPtr (gdImagePtr im, int *size, int quality) | ||
89 | { | ||
90 | void *rv; | ||
91 | gdIOCtx *out = gdNewDynamicCtx (2048, NULL); | ||
92 | - gdImageJpegCtx (im, out, quality); | ||
93 | - rv = gdDPExtractData (out, size); | ||
94 | + if (!_gdImageJpegCtx(im, out, quality)) { | ||
95 | + rv = gdDPExtractData(out, size); | ||
96 | + } else { | ||
97 | + rv = NULL; | ||
98 | + } | ||
99 | out->gd_free (out); | ||
100 | |||
101 | return rv; | ||
102 | @@ -163,6 +167,12 @@ void *gdImageJpegPtr (gdImagePtr im, int *size, int quality) | ||
103 | void jpeg_gdIOCtx_dest (j_compress_ptr cinfo, gdIOCtx * outfile); | ||
104 | |||
105 | void gdImageJpegCtx (gdImagePtr im, gdIOCtx * outfile, int quality) | ||
106 | +{ | ||
107 | + _gdImageJpegCtx(im, outfile, quality); | ||
108 | +} | ||
109 | + | ||
110 | +/* returns 0 on success, 1 on failure */ | ||
111 | +static int _gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality) | ||
112 | { | ||
113 | struct jpeg_compress_struct cinfo; | ||
114 | struct jpeg_error_mgr jerr; | ||
115 | @@ -184,7 +194,7 @@ void gdImageJpegCtx (gdImagePtr im, gdIOCtx * outfile, int quality) | ||
116 | if (row) { | ||
117 | gdFree (row); | ||
118 | } | ||
119 | - return; | ||
120 | + return 1; | ||
121 | } | ||
122 | |||
123 | cinfo.err->error_exit = fatal_jpeg_error; | ||
124 | @@ -277,6 +287,7 @@ void gdImageJpegCtx (gdImagePtr im, gdIOCtx * outfile, int quality) | ||
125 | jpeg_finish_compress (&cinfo); | ||
126 | jpeg_destroy_compress (&cinfo); | ||
127 | gdFree (row); | ||
128 | + return 0; | ||
129 | } | ||
130 | |||
131 | gdImagePtr gdImageCreateFromJpeg (FILE * inFile) | ||
132 | diff --git a/ext/gd/libgd/gd_wbmp.c b/ext/gd/libgd/gd_wbmp.c | ||
133 | index 55ced3443d..fd9edad2ca 100644 | ||
134 | --- a/ext/gd/libgd/gd_wbmp.c | ||
135 | +++ b/ext/gd/libgd/gd_wbmp.c | ||
136 | @@ -82,6 +82,7 @@ int gd_getin (void *in) | ||
137 | return (gdGetC((gdIOCtx *) in)); | ||
138 | } | ||
139 | |||
140 | +static int _gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out); | ||
141 | |||
142 | /* gdImageWBMPCtx | ||
143 | ** -------------- | ||
144 | @@ -93,6 +94,12 @@ int gd_getin (void *in) | ||
145 | ** out: the stream where to write | ||
146 | */ | ||
147 | void gdImageWBMPCtx (gdImagePtr image, int fg, gdIOCtx * out) | ||
148 | +{ | ||
149 | + _gdImageWBMPCtx(image, fg, out); | ||
150 | +} | ||
151 | + | ||
152 | +/* returns 0 on success, 1 on failure */ | ||
153 | +static int _gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out) | ||
154 | { | ||
155 | int x, y, pos; | ||
156 | Wbmp *wbmp; | ||
157 | @@ -100,7 +107,7 @@ void gdImageWBMPCtx (gdImagePtr image, int fg, gdIOCtx * out) | ||
158 | /* create the WBMP */ | ||
159 | if ((wbmp = createwbmp (gdImageSX (image), gdImageSY (image), WBMP_WHITE)) == NULL) { | ||
160 | gd_error("Could not create WBMP"); | ||
161 | - return; | ||
162 | + return 1; | ||
163 | } | ||
164 | |||
165 | /* fill up the WBMP structure */ | ||
166 | @@ -116,7 +123,9 @@ void gdImageWBMPCtx (gdImagePtr image, int fg, gdIOCtx * out) | ||
167 | |||
168 | /* write the WBMP to a gd file descriptor */ | ||
169 | if (writewbmp (wbmp, &gd_putout, out)) { | ||
170 | + freewbmp(wbmp); | ||
171 | gd_error("Could not save WBMP"); | ||
172 | + return 1; | ||
173 | } | ||
174 | /* des submitted this bugfix: gdFree the memory. */ | ||
175 | freewbmp(wbmp); | ||
176 | @@ -204,8 +213,11 @@ void * gdImageWBMPPtr (gdImagePtr im, int *size, int fg) | ||
177 | { | ||
178 | void *rv; | ||
179 | gdIOCtx *out = gdNewDynamicCtx(2048, NULL); | ||
180 | - gdImageWBMPCtx(im, fg, out); | ||
181 | - rv = gdDPExtractData(out, size); | ||
182 | + if (!_gdImageWBMPCtx(im, fg, out)) { | ||
183 | + rv = gdDPExtractData(out, size); | ||
184 | + } else { | ||
185 | + rv = NULL; | ||
186 | + } | ||
187 | out->gd_free(out); | ||
188 | |||
189 | return rv; | ||
190 | -- | ||
191 | 2.17.1 | ||
192 | |||
diff --git a/meta-oe/recipes-devtools/php/php_7.3.9.bb b/meta-oe/recipes-devtools/php/php_7.3.9.bb index 23ab7ca8e..a5c7b9b6b 100644 --- a/meta-oe/recipes-devtools/php/php_7.3.9.bb +++ b/meta-oe/recipes-devtools/php/php_7.3.9.bb | |||
@@ -7,6 +7,7 @@ SRC_URI += "file://0001-acinclude.m4-don-t-unset-cache-variables.patch \ | |||
7 | file://0049-ext-intl-Use-pkg-config-to-detect-icu.patch \ | 7 | file://0049-ext-intl-Use-pkg-config-to-detect-icu.patch \ |
8 | file://0001-Use-pkg-config-for-libxml2-detection.patch \ | 8 | file://0001-Use-pkg-config-for-libxml2-detection.patch \ |
9 | file://debian-php-fixheader.patch \ | 9 | file://debian-php-fixheader.patch \ |
10 | file://CVE-2019-6978.patch \ | ||
10 | " | 11 | " |
11 | SRC_URI_append_class-target = " \ | 12 | SRC_URI_append_class-target = " \ |
12 | file://pear-makefile.patch \ | 13 | file://pear-makefile.patch \ |