Skip to content

Commit 2fca53b

Browse files
zhangstar333w41ter
authored andcommitted
[Bug](function) fix to_ipv6 cause stack-buffer-overflow error (apache#53713)
### What problem does this PR solve? Problem Summary: memcpy(dst, &result, sizeof(result)); when use memcpy, it's size if sizeof(result), so use int64 maybe overflow of dst ``` ==3524968==ERROR: AddressSanitizer: stack-buffer-overflow on address 0x7f18404e1d73 at pc 0x559e2c162b01 bp 0x7f18439e5dc0 sp 0x7f18439e5db8 WRITE of size 8 at 0x7f18404e1d73 thread T1265 (brpc_light) #0 0x559e2c162b00 in bool doris::vectorized::parse_ipv4<char const, doris::vectorized::parse_ipv6(char const*, char const*, unsigned char*)::'lambda'()>(char const*&, doris::vectorized::parse_ipv6(char const*, char const*, unsigned char*)::'lambda'(), unsigned char*, long) /mnt/disk8/zhangsida/doris/be/src/vec/common/format_ip.h:165:5 apache#1 0x559e2c161eb3 in bool doris::vectorized::parse_ipv6<char const, doris::vectorized::parse_ipv6(char const*, char const*, unsigned char*)::'lambda'()>(char const*&, doris::vectorized::parse_ipv6(char const*, char const*, unsigned char*)::'lambda'(), unsigned char*, int) /mnt/disk8/zhangsida/doris/be/src/vec/common/format_ip.h:416:18 apache#2 0x559e2c160c44 in doris::vectorized::parse_ipv6(char const*, char const*, unsigned char*) /mnt/disk8/zhangsida/doris/be/src/vec/common/format_ip.h:467:9 apache#3 0x559e2c160c44 in doris::vectorized::parse_ipv6_whole(char const*, char const*, unsigned char*) /mnt/disk8/zhangsida/doris/be/src/vec/common/format_ip.h:475:12 apache#4 0x559e2c160c44 in doris::IPv6Value::from_string(unsigned __int128&, char const*, unsigned long) /mnt/disk8/zhangsida/doris/be/src/vec/runtime/ipv6_value.h:71:16 apache#5 0x559e4fdb05f3 in doris::vectorized::FunctionToIP<(doris::vectorized::IPConvertExceptionMode)0, (doris::PrimitiveType)37>::execute_impl(doris::FunctionContext*, doris::vectorized::Block&, std::vector<unsigned int, std::allocator<unsigned int>> const&, unsigned int, unsigned long) const /mnt/disk8/zhangsida/doris/be/src/vec/functions/function_ip.h:1180:21 apache#6 0x559e4c233b1e in doris::vectorized::DefaultExecutable::execute_impl(doris::FunctionContext*, doris::vectorized::Block&, std::vector<unsigned int, std::allocator<unsigned int>> const&, unsigned int, unsigned long) const /mnt/disk8/zhangsida/doris/be/src/vec/functions/function.h:447:26 apache#7 0x559e4eebcef3 in doris::vectorized::PreparedFunctionImpl::_execute_skipped_constant_deal(doris::FunctionContext*, doris::vectorized::Block&, std::vector<unsigned int, std::allocator<unsigned int>> const&, unsigned int, unsigned long, bool) const /mnt/disk8/zhangsida/doris/be/src/vec/functions/function.cpp apache#8 0x559e4eeb68c4 in doris::vectorized::PreparedFunctionImpl::default_implementation_for_constant_arguments(doris::FunctionContext*, doris::vectorized::Block&, std::vector<unsigned int, std::allocator<unsigned int>> const&, unsigned int, unsigned long, bool, bool*) const /mnt/disk8/zhangsida/doris/be/src/vec/functions/function.cpp:168:5 apache#9 0x559e4eeb8fc4 in doris::vectorized::PreparedFunctionImpl::execute_without_low_cardinality_columns(doris::FunctionContext*, doris::vectorized::Block&, std::vector<unsigned int, std::allocator<unsigned int>> const&, unsigned int, unsigned long, bool) const /mnt/disk8/zhangsida/doris/be/src/vec/functions/function.cpp:237:5 ```
1 parent e63326f commit 2fca53b

3 files changed

Lines changed: 26 additions & 7 deletions

File tree

‎be/src/vec/common/format_ip.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,12 +125,12 @@ inline void format_ipv4(const unsigned char* src, char*& dst, uint8_t mask_tail_
125125
*/
126126
template <typename T, typename EOFfunction>
127127
requires(std::is_same<typename std::remove_cv<T>::type, char>::value)
128-
inline bool parse_ipv4(T*& src, EOFfunction eof, unsigned char* dst, int64_t first_octet = -1) {
128+
inline bool parse_ipv4(T*& src, EOFfunction eof, unsigned char* dst, int32_t first_octet = -1) {
129129
if (src == nullptr || first_octet > IPV4_MAX_OCTET_VALUE) {
130130
return false;
131131
}
132132

133-
int64_t result = 0;
133+
UInt32 result = 0;
134134
int offset = (IPV4_BINARY_LENGTH - 1) * IPV4_OCTET_BITS;
135135
if (first_octet >= 0) {
136136
result |= first_octet << offset;
@@ -142,7 +142,7 @@ inline bool parse_ipv4(T*& src, EOFfunction eof, unsigned char* dst, int64_t fir
142142
return false;
143143
}
144144

145-
int64_t value = 0;
145+
UInt32 value = 0;
146146
size_t len = 0;
147147
while (is_numeric_ascii(*src) && len <= 3) {
148148
value = value * DECIMAL_BASE + (*src - '0');

‎be/src/vec/functions/function_ip.h‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,10 +151,8 @@ ColumnPtr convert_to_ipv4(ColumnPtr column, const PaddedPODArray<UInt8>* null_ma
151151
vec_null_map_to = &col_null_map_to->get_data();
152152
}
153153

154-
auto col_res = ToColumn::create();
155-
154+
auto col_res = ToColumn::create(column_size, 0);
156155
auto& vec_res = col_res->get_data();
157-
vec_res.resize(column_size);
158156

159157
const ColumnString::Chars& vec_src = column_string->get_chars();
160158
const ColumnString::Offsets& offsets_src = column_string->get_offsets();

‎be/test/vec/columns/column_ip_test.cpp‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
#include <gtest/gtest.h>
2121

2222
#include "vec/columns/column.h"
23-
#include "vec/columns/column_array.h"
2423
#include "vec/columns/common_column_test.h"
2524
#include "vec/core/types.h"
2625
#include "vec/data_types/data_type.h"
2726
#include "vec/data_types/data_type_factory.hpp"
2827
#include "vec/data_types/data_type_nullable.h"
28+
#include "vec/functions/function_ip.h"
2929

3030
// this test is gonna to make a template ColumnTest
3131
// for example column_ip should test these functions
@@ -312,4 +312,25 @@ TEST_F(ColumnIPTest, HashTest) {
312312
assert_update_crc_hashes_callback(ip_cols, serde, pts);
313313
};
314314

315+
TEST_F(ColumnIPTest, IPv6ValueFromStringTest) {
316+
std::string ipv6_str = "1111:2222:3333:4444:5555:6666:123.123.123.123";
317+
IPv6 ipv6_val = 0;
318+
ASSERT_EQ(IPv6Value::from_string(ipv6_val, ipv6_str.data(), ipv6_str.size()), true);
319+
ASSERT_EQ("1111:2222:3333:4444:5555:6666:7b7b:7b7b", IPv6Value(ipv6_val).to_string());
320+
};
321+
322+
TEST_F(ColumnIPTest, IPv4ValueFromStringTest) {
323+
std::string ipv4_str = "127.0.0.1";
324+
IPv4 ipv4_val = 0;
325+
ASSERT_EQ(IPv4Value::from_string(ipv4_val, ipv4_str.data(), ipv4_str.size()), true);
326+
ASSERT_EQ("127.0.0.1", IPv4Value(ipv4_val).to_string());
327+
};
328+
329+
TEST_F(ColumnIPTest, IPv4Parse) {
330+
std::string ipv4_str = "127.0.0.1";
331+
Int64 result_value = 0;
332+
ASSERT_EQ(try_parse_ipv4(ipv4_str.data(), result_value), true);
333+
ASSERT_EQ(2130706433, result_value);
334+
};
335+
315336
} // namespace doris::vectorized

0 commit comments

Comments
 (0)