Skip to content

Commit bb16c64

Browse files
SoumyaWindakuster
authored andcommitted
unixodbc: Fix CVE-2024-1013
An out-of-bounds stack write flaw was found in unixODBC on 64-bit architectures where the caller has 4 bytes and callee writes 8 bytes. This issue may go unnoticed on little-endian architectures, while big-endian architectures can be broken. References: https://nvd.nist.gov/vuln/detail/CVE-2024-1013 Signed-off-by: Soumya Sambu <soumya.sambu@windriver.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
1 parent 9a22be4 commit bb16c64

2 files changed

Lines changed: 54 additions & 0 deletions

File tree

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
From 45f501e1be2db6b017cc242c79bfb9de32b332a1 Mon Sep 17 00:00:00 2001
2+
From: Florian Weimer <fweimer@redhat.com>
3+
Date: Mon, 29 Jan 2024 08:27:29 +0100
4+
Subject: [PATCH] PostgreSQL driver: Fix incompatible pointer-to-integer types
5+
6+
These result in out-of-bounds stack writes on 64-bit architectures
7+
(caller has 4 bytes, callee writes 8 bytes), and seem to have gone
8+
unnoticed on little-endian architectures (although big-endian
9+
architectures must be broken).
10+
11+
This change is required to avoid a build failure with GCC 14.
12+
13+
CVE: CVE-2024-1013
14+
15+
Upstream-Status: Backport [https://github.com/lurcher/unixODBC/commit/45f501e1be2db6b017cc242c79bfb9de32b332a1]
16+
17+
Signed-off-by: Soumya Sambu <soumya.sambu@windriver.com>
18+
---
19+
Drivers/Postgre7.1/info.c | 6 +++---
20+
1 file changed, 3 insertions(+), 3 deletions(-)
21+
22+
diff --git a/Drivers/Postgre7.1/info.c b/Drivers/Postgre7.1/info.c
23+
index 63ac91f..2216ecd 100755
24+
--- a/Drivers/Postgre7.1/info.c
25+
+++ b/Drivers/Postgre7.1/info.c
26+
@@ -1779,14 +1779,14 @@ char *table_name;
27+
char index_name[MAX_INFO_STRING];
28+
short fields_vector[8];
29+
char isunique[10], isclustered[10];
30+
-SDWORD index_name_len, fields_vector_len;
31+
+SQLLEN index_name_len, fields_vector_len;
32+
TupleNode *row;
33+
int i;
34+
HSTMT hcol_stmt;
35+
StatementClass *col_stmt, *indx_stmt;
36+
char column_name[MAX_INFO_STRING], relhasrules[MAX_INFO_STRING];
37+
char **column_names = 0;
38+
-Int4 column_name_len;
39+
+SQLLEN column_name_len;
40+
int total_columns = 0;
41+
char error = TRUE;
42+
ConnInfo *ci;
43+
@@ -2136,7 +2136,7 @@ HSTMT htbl_stmt;
44+
StatementClass *tbl_stmt;
45+
char tables_query[STD_STATEMENT_LEN];
46+
char attname[MAX_INFO_STRING];
47+
-SDWORD attname_len;
48+
+SQLLEN attname_len;
49+
char pktab[MAX_TABLE_LEN + 1];
50+
Int2 result_cols;
51+
52+
--
53+
2.40.0

meta-oe/recipes-support/unixodbc/unixodbc_2.3.9.bb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ DEPENDS = "libtool readline"
1010

1111
SRC_URI = "http://ftp.unixodbc.org/unixODBC-${PV}.tar.gz \
1212
file://do-not-use-libltdl-source-directory.patch \
13+
file://CVE-2024-1013.patch \
1314
"
1415
SRC_URI[sha256sum] = "52833eac3d681c8b0c9a5a65f2ebd745b3a964f208fc748f977e44015a31b207"
1516

0 commit comments

Comments
 (0)