aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2021-03-17 16:10:37 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2021-03-17 16:10:37 -0400
commita50e4fd028a1ece2b1a04df2c9ae6581783e9eef (patch)
treed6a0a97c3394d1651b7ee67b84f5c4b3c4f53d79 /src
parent081876d75ea15c3bd2ee5ba64a794fd8ea46d794 (diff)
downloadpostgresql-a50e4fd028a1ece2b1a04df2c9ae6581783e9eef.tar.gz
postgresql-a50e4fd028a1ece2b1a04df2c9ae6581783e9eef.zip
Prevent buffer overrun in read_tablespace_map().
Robert Foggia of Trustwave reported that read_tablespace_map() fails to prevent an overrun of its on-stack input buffer. Since the tablespace map file is presumed trustworthy, this does not seem like an interesting security vulnerability, but still we should fix it just in the name of robustness. While here, document that pg_basebackup's --tablespace-mapping option doesn't work with tar-format output, because it doesn't. To make it work, we'd have to modify the tablespace_map file within the tarball sent by the server, which might be possible but I'm not volunteering. (Less-painful solutions would require changing the basebackup protocol so that the source server could adjust the map. That's not very appetizing either.)
Diffstat (limited to 'src')
-rw-r--r--src/backend/access/transam/xlog.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index f4d1ce5deae..9be0cb236d3 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -11959,7 +11959,7 @@ read_tablespace_map(List **tablespaces)
}
else if ((ch == '\n' || ch == '\r') && prev_ch == '\\')
str[i - 1] = ch;
- else
+ else if (i < sizeof(str) - 1)
str[i++] = ch;
prev_ch = ch;
}