mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Detect integer overflow in array_set_slice().

Browse Source 
When provided an empty initial array, array_set_slice() fails to
check for overflow when computing the new array's dimensions.
While such overflows are ordinarily caught by ArrayGetNItems(),
commands with the following form are accepted:

	INSERT INTO t (i[-2147483648:2147483647]) VALUES ('{}');

To fix, perform the hazardous computations using overflow-detecting
arithmetic routines.  As with commit 18b585155a, the added test
cases generate errors that include a platform-dependent value, so
we again use psql's VERBOSITY parameter to suppress printing the
message text.

Reported-by: Alexander Lakhin
Author: Joseph Koshakow
Reviewed-by: Jian He
Discussion: https://postgr.es/m/31ad2cd1-db94-bdb3-f91a-65ffdb4bef95%40gmail.com
Backpatch-through: 12
This commit is contained in:
Nathan Bossart 2024-07-23 21:59:02 -05:00
parent 9aa644f929
commit 547dd2cbda
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/backend/utils/adt/arrayfuncs.c
View File

@ -2899,7 +2899,14 @@ array_set_slice(Datum arraydatum,
errdetail("When assigning to a slice of an empty array value," errdetail("When assigning to a slice of an empty array value,"
" slice boundaries must be fully specified."))); " slice boundaries must be fully specified.")));
dim[i] = 1 + upperIndx[i] - lowerIndx[i]; /* compute "upperIndx[i] - lowerIndx[i] + 1", detecting overflow */
if (pg_sub_s32_overflow(upperIndx[i], lowerIndx[i], &dim[i]) ||
pg_add_s32_overflow(dim[i], 1, &dim[i]))
ereport(ERROR,
(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
errmsg("array size exceeds the maximum allowed (%d)",
(int) MaxArraySize)));
lb[i] = lowerIndx[i]; lb[i] = lowerIndx[i];
} }

4
src/test/regress/expected/arrays.out
View File

@ -1402,6 +1402,10 @@ update arr_pk_tbl set f1[2147483647] = 42 where pk = 10;
ERROR: 54000 ERROR: 54000
update arr_pk_tbl set f1[2147483646:2147483647] = array[4,2] where pk = 10; update arr_pk_tbl set f1[2147483646:2147483647] = array[4,2] where pk = 10;
ERROR: 54000 ERROR: 54000
insert into arr_pk_tbl(pk, f1[0:2147483647]) values (2, '{}');
ERROR: 54000
insert into arr_pk_tbl(pk, f1[-2147483648:2147483647]) values (2, '{}');
ERROR: 54000
-- also exercise the expanded-array case -- also exercise the expanded-array case
do $$ declare a int[]; do $$ declare a int[];
begin begin

2
src/test/regress/sql/arrays.sql
View File

@ -441,6 +441,8 @@ reset enable_bitmapscan;
insert into arr_pk_tbl values(10, '[-2147483648:-2147483647]={1,2}'); insert into arr_pk_tbl values(10, '[-2147483648:-2147483647]={1,2}');
update arr_pk_tbl set f1[2147483647] = 42 where pk = 10; update arr_pk_tbl set f1[2147483647] = 42 where pk = 10;
update arr_pk_tbl set f1[2147483646:2147483647] = array[4,2] where pk = 10; update arr_pk_tbl set f1[2147483646:2147483647] = array[4,2] where pk = 10;
insert into arr_pk_tbl(pk, f1[0:2147483647]) values (2, '{}');
insert into arr_pk_tbl(pk, f1[-2147483648:2147483647]) values (2, '{}');
-- also exercise the expanded-array case -- also exercise the expanded-array case
do $$ declare a int[]; do $$ declare a int[];