From 14dc50623a5339161a84f1dff4aec4db9d0fa558 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Dec 13 2023 07:48:07 +0000 Subject: import rh-postgresql10-postgresql-10.23-2.el7 --- diff --git a/SOURCES/postgresql-CVE-2023-5869.patch b/SOURCES/postgresql-CVE-2023-5869.patch new file mode 100644 index 0000000..655d157 --- /dev/null +++ b/SOURCES/postgresql-CVE-2023-5869.patch @@ -0,0 +1,471 @@ +This patch was created based on upstream commit: +https://git.postgresql.org/gitweb/?p=postgresql.git;a=commit;h=18b585155a891784ca8985f595ebc0dde94e0d43 + +The upstream regression test is not applicable for PG10 + +diff -urN -x '*cscope*' postgresql-10.23/src/include/common/int.h postgresql-10-patched/src/include/common/int.h +--- postgresql-10.23/src/include/common/int.h 1970-01-01 01:00:00.000000000 +0100 ++++ postgresql-10-patched/src/include/common/int.h 2023-11-09 16:44:19.000000000 +0100 +@@ -0,0 +1,273 @@ ++/*------------------------------------------------------------------------- ++ * ++ * int.h ++ * Routines to perform integer math, while checking for overflows. ++ * ++ * The routines in this file are intended to be well defined C, without ++ * relying on compiler flags like -fwrapv. ++ * ++ * To reduce the overhead of these routines try to use compiler intrinsics ++ * where available. That's not that important for the 16, 32 bit cases, but ++ * the 64 bit cases can be considerably faster with intrinsics. In case no ++ * intrinsics are available 128 bit math is used where available. ++ * ++ * Copyright (c) 2017-2018, PostgreSQL Global Development Group ++ * ++ * src/include/common/int.h ++ * ++ *------------------------------------------------------------------------- ++ */ ++#ifndef COMMON_INT_H ++#define COMMON_INT_H ++ ++/* ++ * If a + b overflows, return true, otherwise store the result of a + b into ++ * *result. The content of *result is implementation defined in case of ++ * overflow. ++ */ ++static inline bool ++pg_add_s16_overflow(int16 a, int16 b, int16 *result) ++{ ++#if defined(HAVE__BUILTIN_OP_OVERFLOW) ++ return __builtin_add_overflow(a, b, result); ++#else ++ int32 res = (int32) a + (int32) b; ++ ++ if (res > PG_INT16_MAX || res < PG_INT16_MIN) ++ { ++ *result = 0x5EED; /* to avoid spurious warnings */ ++ return true; ++ } ++ *result = (int16) res; ++ return false; ++#endif ++} ++ ++/* ++ * If a - b overflows, return true, otherwise store the result of a - b into ++ * *result. The content of *result is implementation defined in case of ++ * overflow. ++ */ ++static inline bool ++pg_sub_s16_overflow(int16 a, int16 b, int16 *result) ++{ ++#if defined(HAVE__BUILTIN_OP_OVERFLOW) ++ return __builtin_sub_overflow(a, b, result); ++#else ++ int32 res = (int32) a - (int32) b; ++ ++ if (res > PG_INT16_MAX || res < PG_INT16_MIN) ++ { ++ *result = 0x5EED; /* to avoid spurious warnings */ ++ return true; ++ } ++ *result = (int16) res; ++ return false; ++#endif ++} ++ ++/* ++ * If a * b overflows, return true, otherwise store the result of a * b into ++ * *result. The content of *result is implementation defined in case of ++ * overflow. ++ */ ++static inline bool ++pg_mul_s16_overflow(int16 a, int16 b, int16 *result) ++{ ++#if defined(HAVE__BUILTIN_OP_OVERFLOW) ++ return __builtin_mul_overflow(a, b, result); ++#else ++ int32 res = (int32) a * (int32) b; ++ ++ if (res > PG_INT16_MAX || res < PG_INT16_MIN) ++ { ++ *result = 0x5EED; /* to avoid spurious warnings */ ++ return true; ++ } ++ *result = (int16) res; ++ return false; ++#endif ++} ++ ++/* ++ * If a + b overflows, return true, otherwise store the result of a + b into ++ * *result. The content of *result is implementation defined in case of ++ * overflow. ++ */ ++static inline bool ++pg_add_s32_overflow(int32 a, int32 b, int32 *result) ++{ ++#if defined(HAVE__BUILTIN_OP_OVERFLOW) ++ return __builtin_add_overflow(a, b, result); ++#else ++ int64 res = (int64) a + (int64) b; ++ ++ if (res > PG_INT32_MAX || res < PG_INT32_MIN) ++ { ++ *result = 0x5EED; /* to avoid spurious warnings */ ++ return true; ++ } ++ *result = (int32) res; ++ return false; ++#endif ++} ++ ++/* ++ * If a - b overflows, return true, otherwise store the result of a - b into ++ * *result. The content of *result is implementation defined in case of ++ * overflow. ++ */ ++static inline bool ++pg_sub_s32_overflow(int32 a, int32 b, int32 *result) ++{ ++#if defined(HAVE__BUILTIN_OP_OVERFLOW) ++ return __builtin_sub_overflow(a, b, result); ++#else ++ int64 res = (int64) a - (int64) b; ++ ++ if (res > PG_INT32_MAX || res < PG_INT32_MIN) ++ { ++ *result = 0x5EED; /* to avoid spurious warnings */ ++ return true; ++ } ++ *result = (int32) res; ++ return false; ++#endif ++} ++ ++/* ++ * If a * b overflows, return true, otherwise store the result of a * b into ++ * *result. The content of *result is implementation defined in case of ++ * overflow. ++ */ ++static inline bool ++pg_mul_s32_overflow(int32 a, int32 b, int32 *result) ++{ ++#if defined(HAVE__BUILTIN_OP_OVERFLOW) ++ return __builtin_mul_overflow(a, b, result); ++#else ++ int64 res = (int64) a * (int64) b; ++ ++ if (res > PG_INT32_MAX || res < PG_INT32_MIN) ++ { ++ *result = 0x5EED; /* to avoid spurious warnings */ ++ return true; ++ } ++ *result = (int32) res; ++ return false; ++#endif ++} ++ ++/* ++ * If a + b overflows, return true, otherwise store the result of a + b into ++ * *result. The content of *result is implementation defined in case of ++ * overflow. ++ */ ++static inline bool ++pg_add_s64_overflow(int64 a, int64 b, int64 *result) ++{ ++#if defined(HAVE__BUILTIN_OP_OVERFLOW) ++ return __builtin_add_overflow(a, b, result); ++#elif defined(HAVE_INT128) ++ int128 res = (int128) a + (int128) b; ++ ++ if (res > PG_INT64_MAX || res < PG_INT64_MIN) ++ { ++ *result = 0x5EED; /* to avoid spurious warnings */ ++ return true; ++ } ++ *result = (int64) res; ++ return false; ++#else ++ if ((a > 0 && b > 0 && a > PG_INT64_MAX - b) || ++ (a < 0 && b < 0 && a < PG_INT64_MIN - b)) ++ { ++ *result = 0x5EED; /* to avoid spurious warnings */ ++ return true; ++ } ++ *result = a + b; ++ return false; ++#endif ++} ++ ++/* ++ * If a - b overflows, return true, otherwise store the result of a - b into ++ * *result. The content of *result is implementation defined in case of ++ * overflow. ++ */ ++static inline bool ++pg_sub_s64_overflow(int64 a, int64 b, int64 *result) ++{ ++#if defined(HAVE__BUILTIN_OP_OVERFLOW) ++ return __builtin_sub_overflow(a, b, result); ++#elif defined(HAVE_INT128) ++ int128 res = (int128) a - (int128) b; ++ ++ if (res > PG_INT64_MAX || res < PG_INT64_MIN) ++ { ++ *result = 0x5EED; /* to avoid spurious warnings */ ++ return true; ++ } ++ *result = (int64) res; ++ return false; ++#else ++ if ((a < 0 && b > 0 && a < PG_INT64_MIN + b) || ++ (a > 0 && b < 0 && a > PG_INT64_MAX + b)) ++ { ++ *result = 0x5EED; /* to avoid spurious warnings */ ++ return true; ++ } ++ *result = a - b; ++ return false; ++#endif ++} ++ ++/* ++ * If a * b overflows, return true, otherwise store the result of a * b into ++ * *result. The content of *result is implementation defined in case of ++ * overflow. ++ */ ++static inline bool ++pg_mul_s64_overflow(int64 a, int64 b, int64 *result) ++{ ++#if defined(HAVE__BUILTIN_OP_OVERFLOW) ++ return __builtin_mul_overflow(a, b, result); ++#elif defined(HAVE_INT128) ++ int128 res = (int128) a * (int128) b; ++ ++ if (res > PG_INT64_MAX || res < PG_INT64_MIN) ++ { ++ *result = 0x5EED; /* to avoid spurious warnings */ ++ return true; ++ } ++ *result = (int64) res; ++ return false; ++#else ++ /* ++ * Overflow can only happen if at least one value is outside the range ++ * sqrt(min)..sqrt(max) so check that first as the division can be quite a ++ * bit more expensive than the multiplication. ++ * ++ * Multiplying by 0 or 1 can't overflow of course and checking for 0 ++ * separately avoids any risk of dividing by 0. Be careful about dividing ++ * INT_MIN by -1 also, note reversing the a and b to ensure we're always ++ * dividing it by a positive value. ++ * ++ */ ++ if ((a > PG_INT32_MAX || a < PG_INT32_MIN || ++ b > PG_INT32_MAX || b < PG_INT32_MIN) && ++ a != 0 && a != 1 && b != 0 && b != 1 && ++ ((a > 0 && b > 0 && a > PG_INT64_MAX / b) || ++ (a > 0 && b < 0 && b < PG_INT64_MIN / a) || ++ (a < 0 && b > 0 && a < PG_INT64_MIN / b) || ++ (a < 0 && b < 0 && a < PG_INT64_MAX / b))) ++ { ++ *result = 0x5EED; /* to avoid spurious warnings */ ++ return true; ++ } ++ *result = a * b; ++ return false; ++#endif ++} ++ ++#endif /* COMMON_INT_H */ +diff -urN -x '*cscope*' postgresql-10.23/src/backend/utils/adt/arrayfuncs.c postgresql-10-patched/src/backend/utils/adt/arrayfuncs.c +--- postgresql-10.23/src/backend/utils/adt/arrayfuncs.c 2022-11-07 22:51:10.000000000 +0100 ++++ postgresql-10-patched/src/backend/utils/adt/arrayfuncs.c 2023-11-09 14:36:30.000000000 +0100 +@@ -31,7 +31,7 @@ + #include "utils/lsyscache.h" + #include "utils/memutils.h" + #include "utils/typcache.h" +- ++#include "common/int.h" + + /* + * GUC parameter +@@ -2309,22 +2309,35 @@ + addedbefore = addedafter = 0; + + /* +- * Check subscripts +- */ ++ * Check subscripts. We assume the existing subscripts passed ++ * ArrayCheckBounds, so that dim[i] + lb[i] can be computed without ++ * overflow. But we must beware of other overflows in our calculations of ++ * new dim[] values. ++ */ + if (ndim == 1) + { + if (indx[0] < lb[0]) + { +- addedbefore = lb[0] - indx[0]; +- dim[0] += addedbefore; ++ if (pg_sub_s32_overflow(lb[0], indx[0], &addedbefore) || ++ pg_add_s32_overflow(dim[0], addedbefore, &dim[0])) ++ ereport(ERROR, ++ (errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED), ++ errmsg("array size exceeds the maximum allowed (%d)", ++ (int) MaxArraySize))); ++ + lb[0] = indx[0]; + if (addedbefore > 1) + newhasnulls = true; /* will insert nulls */ + } + if (indx[0] >= (dim[0] + lb[0])) + { +- addedafter = indx[0] - (dim[0] + lb[0]) + 1; +- dim[0] += addedafter; ++ if (pg_sub_s32_overflow(indx[0], dim[0] + lb[0], &addedafter) || ++ pg_add_s32_overflow(addedafter, 1, &addedafter) || ++ pg_add_s32_overflow(dim[0], addedafter, &dim[0])) ++ ereport(ERROR, ++ (errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED), ++ errmsg("array size exceeds the maximum allowed (%d)", ++ (int) MaxArraySize))); + if (addedafter > 1) + newhasnulls = true; /* will insert nulls */ + } +@@ -2568,14 +2581,21 @@ + addedbefore = addedafter = 0; + + /* +- * Check subscripts (this logic matches original array_set_element) +- */ ++ * Check subscripts (this logic must match array_set_element). We assume ++ * the existing subscripts passed ArrayCheckBounds, so that dim[i] + lb[i] ++ * can be computed without overflow. But we must beware of other ++ * overflows in our calculations of new dim[] values. ++ */ + if (ndim == 1) + { + if (indx[0] < lb[0]) + { +- addedbefore = lb[0] - indx[0]; +- dim[0] += addedbefore; ++ if (pg_sub_s32_overflow(lb[0], indx[0], &addedbefore) || ++ pg_add_s32_overflow(dim[0], addedbefore, &dim[0])) ++ ereport(ERROR, ++ (errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED), ++ errmsg("array size exceeds the maximum allowed (%d)", ++ (int) MaxArraySize))); + lb[0] = indx[0]; + dimschanged = true; + if (addedbefore > 1) +@@ -2583,8 +2603,13 @@ + } + if (indx[0] >= (dim[0] + lb[0])) + { +- addedafter = indx[0] - (dim[0] + lb[0]) + 1; +- dim[0] += addedafter; ++ if (pg_sub_s32_overflow(indx[0], dim[0] + lb[0], &addedafter) || ++ pg_add_s32_overflow(addedafter, 1, &addedafter) || ++ pg_add_s32_overflow(dim[0], addedafter, &dim[0])) ++ ereport(ERROR, ++ (errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED), ++ errmsg("array size exceeds the maximum allowed (%d)", ++ (int) MaxArraySize))); + dimschanged = true; + if (addedafter > 1) + newhasnulls = true; /* will insert nulls */ +@@ -2866,8 +2891,11 @@ + addedbefore = addedafter = 0; + + /* +- * Check subscripts +- */ ++ * Check subscripts. We assume the existing subscripts passed ++ * ArrayCheckBounds, so that dim[i] + lb[i] can be computed without ++ * overflow. But we must beware of other overflows in our calculations of ++ * new dim[] values. ++ */ + if (ndim == 1) + { + Assert(nSubscripts == 1); +@@ -2881,18 +2909,31 @@ + errmsg("upper bound cannot be less than lower bound"))); + if (lowerIndx[0] < lb[0]) + { +- if (upperIndx[0] < lb[0] - 1) +- newhasnulls = true; /* will insert nulls */ +- addedbefore = lb[0] - lowerIndx[0]; +- dim[0] += addedbefore; ++ //addedbefore = lb[0] - lowerIndx[0]; ++ //dim[0] += addedbefore; ++ if (pg_sub_s32_overflow(lb[0], lowerIndx[0], &addedbefore) || ++ pg_add_s32_overflow(dim[0], addedbefore, &dim[0])) ++ ereport(ERROR, ++ (errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED), ++ errmsg("array size exceeds the maximum allowed (%d)", ++ (int) MaxArraySize))); + lb[0] = lowerIndx[0]; ++ if (addedbefore > 1) ++ newhasnulls = true; /* will insert nulls */ + } + if (upperIndx[0] >= (dim[0] + lb[0])) + { +- if (lowerIndx[0] > (dim[0] + lb[0])) +- newhasnulls = true; /* will insert nulls */ +- addedafter = upperIndx[0] - (dim[0] + lb[0]) + 1; +- dim[0] += addedafter; ++ //addedafter = upperIndx[0] - (dim[0] + lb[0]) + 1; ++ //dim[0] += addedafter; ++ if (pg_sub_s32_overflow(upperIndx[0], dim[0] + lb[0], &addedafter) || ++ pg_add_s32_overflow(addedafter, 1, &addedafter) || ++ pg_add_s32_overflow(dim[0], addedafter, &dim[0])) ++ ereport(ERROR, ++ (errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED), ++ errmsg("array size exceeds the maximum allowed (%d)", ++ (int) MaxArraySize))); ++ if (addedafter > 1) ++ newhasnulls = true; /* will insert nulls */ + } + } + else +diff -urN -x '*cscope*' postgresql-10.23/src/backend/utils/adt/arrayutils.c postgresql-10-patched/src/backend/utils/adt/arrayutils.c +--- postgresql-10.23/src/backend/utils/adt/arrayutils.c 2022-11-07 22:51:10.000000000 +0100 ++++ postgresql-10-patched/src/backend/utils/adt/arrayutils.c 2023-11-09 14:38:52.000000000 +0100 +@@ -63,10 +63,6 @@ + * This must do overflow checking, since it is used to validate that a user + * dimensionality request doesn't overflow what we can handle. + * +- * We limit array sizes to at most about a quarter billion elements, +- * so that it's not necessary to check for overflow in quite so many +- * places --- for instance when palloc'ing Datum arrays. +- * + * The multiplication overflow check only works on machines that have int64 + * arithmetic, but that is nearly all platforms these days, and doing check + * divides for those that don't seems way too expensive. +@@ -77,7 +73,6 @@ + int32 ret; + int i; + +-#define MaxArraySize ((Size) (MaxAllocSize / sizeof(Datum))) + + if (ndim <= 0) + return 0; +diff -urN -x '*cscope*' postgresql-10.23/src/include/utils/array.h postgresql-10-patched/src/include/utils/array.h +--- postgresql-10.23/src/include/utils/array.h 2022-11-07 22:51:10.000000000 +0100 ++++ postgresql-10-patched/src/include/utils/array.h 2023-11-09 14:41:48.000000000 +0100 +@@ -66,6 +66,13 @@ + + + /* ++ * Maximum number of elements in an array. We limit this to at most about a ++ * quarter billion elements, so that it's not necessary to check for overflow ++ * in quite so many places --- for instance when palloc'ing Datum arrays. ++ */ ++#define MaxArraySize ((Size) (MaxAllocSize / sizeof(Datum))) ++ ++/* + * Arrays are varlena objects, so must meet the varlena convention that + * the first int32 of the object contains the total object size in bytes. + * Be sure to use VARSIZE() and SET_VARSIZE() to access it, though! diff --git a/SPECS/postgresql.spec b/SPECS/postgresql.spec index 2f4d557..2e3ac8e 100644 --- a/SPECS/postgresql.spec +++ b/SPECS/postgresql.spec @@ -75,7 +75,7 @@ Summary: PostgreSQL client programs Name: %{?scl_prefix}postgresql %global majorversion 10 Version: %{majorversion}.23 -Release: 1%{?dist} +Release: 2%{?dist} # The PostgreSQL license is very similar to other MIT licenses, but the OSI # recognizes it as an independent license, so we do as well. @@ -114,6 +114,7 @@ Patch6: postgresql-man.patch Patch7: postgresql-socket-dirs-pgupgrade.patch Patch8: postgresql-libpqwalreceiver-rpath.patch Patch9: postgresql-pgupgrade-socketdir-option.patch +Patch10: postgresql-CVE-2023-5869.patch BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk BuildRequires: perl(ExtUtils::Embed), perl-devel @@ -396,6 +397,7 @@ benchmarks. %patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 # We used to run autoconf here, but there's no longer any real need to, # since Postgres ships with a reasonably modern configure script. @@ -1228,6 +1230,9 @@ make -C postgresql-setup-%{setup_version} check %endif %changelog +* Tue Nov 14 2023 Filip Janus - 10.23-2 +- Fix CVE-2023-5869 + * Wed Jan 04 2023 Filip Janus - 10.23-1 - Update to 10.23 - Resolves: #2157611