Hello community, here is the log from the commit of package ndpi for openSUSE:Factory checked in at 2020-04-27 23:38:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ndpi (Old) and /work/SRC/openSUSE:Factory/.ndpi.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ndpi" Mon Apr 27 23:38:49 2020 rev:8 rq:798122 version:3.2 Changes: -------- --- /work/SRC/openSUSE:Factory/ndpi/ndpi.changes 2020-02-22 19:08:04.890543023 +0100 +++ /work/SRC/openSUSE:Factory/.ndpi.new.2738/ndpi.changes 2020-04-27 23:38:58.115592396 +0200 @@ -1,0 +2,6 @@ +Fri Apr 24 17:25:05 UTC 2020 - Petr Cervinka <[email protected]> + +- Add upstream patch to fix ntopng build failure (ntopng#3675) + 001-Refresh-of-ndpi_netbios_name_interpret.patch + +------------------------------------------------------------------- New: ---- 001-Refresh-of-ndpi_netbios_name_interpret.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ndpi.spec ++++++ --- /var/tmp/diff_new_pack.HWk8Kl/_old 2020-04-27 23:38:59.527595153 +0200 +++ /var/tmp/diff_new_pack.HWk8Kl/_new 2020-04-27 23:38:59.531595160 +0200 @@ -31,6 +31,7 @@ Group: Development/Libraries/C and C++ URL: https://github.com/ntop/nDPI Source: https://github.com/ntop/nDPI/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +Patch0: 001-Refresh-of-ndpi_netbios_name_interpret.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-c++ @@ -88,6 +89,7 @@ %prep %setup -q -n nDPI-%{version} +%patch0 -p1 %build sh autogen.sh ++++++ 001-Refresh-of-ndpi_netbios_name_interpret.patch ++++++ >From e4512dbcb9e1db0500290b712257e501d1440d71 Mon Sep 17 00:00:00 2001 From: Luca Deri <[email protected]> Date: Tue, 24 Mar 2020 12:18:15 +0100 Subject: [PATCH] Refresh of ndpi_netbios_name_interpret --- src/include/ndpi_main.h | 2 +- src/lib/protocols/netbios.c | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/include/ndpi_main.h b/src/include/ndpi_main.h index c909adc7..9335f215 100644 --- a/src/include/ndpi_main.h +++ b/src/include/ndpi_main.h @@ -132,7 +132,7 @@ extern "C" { u_int16_t** tcp_master_proto, u_int16_t** udp_master_proto); #/* NDPI_PROTOCOL_NETBIOS */ - int ndpi_netbios_name_interpret(char *in, char *out, u_int out_len); + int ndpi_netbios_name_interpret(char *in, size_t inlen, char *out, u_int out_len); #ifdef NDPI_ENABLE_DEBUG_MESSAGES void ndpi_debug_get_last_log_function_line(struct ndpi_detection_module_struct *ndpi_struct, diff --git a/src/lib/protocols/netbios.c b/src/lib/protocols/netbios.c index 19cffeb8..1c65b185 100644 --- a/src/lib/protocols/netbios.c +++ b/src/lib/protocols/netbios.c @@ -35,17 +35,17 @@ struct netbios_header { }; /* The function below has been inherited by tcpdump */ -int ndpi_netbios_name_interpret(char *in, char *out, u_int out_len) { +int ndpi_netbios_name_interpret(char *in, size_t inlen, char *out, u_int out_len) { int ret = 0, len; char *b; - + len = (*in++)/2; b = out; *out = 0; - if(len > (out_len-1) || len < 1) - return(-1); - + if(len > (out_len-1) || len < 1 || 2*len > inlen) + return(-1); + while (len--) { if(in[0] < 'A' || in[0] > 'P' || in[1] < 'A' || in[1] > 'P') { *out = 0; @@ -53,7 +53,7 @@ int ndpi_netbios_name_interpret(char *in, char *out, u_int out_len) { } *out = ((in[0]-'A')<<4) + (in[1]-'A'); - + in += 2; if(isprint(*out)) @@ -69,13 +69,12 @@ int ndpi_netbios_name_interpret(char *in, char *out, u_int out_len) { return(ret); } - static void ndpi_int_netbios_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) { char name[64]; u_int off = flow->packet.payload[12] == 0x20 ? 12 : 14; - if(ndpi_netbios_name_interpret((char*)&flow->packet.payload[off], name, sizeof(name)) > 0) + if(ndpi_netbios_name_interpret((char*)&flow->packet.payload[off], flow->packet.payload_packet_len - off, name, sizeof(name)) > 0) snprintf((char*)flow->host_server_name, sizeof(flow->host_server_name)-1, "%s", name); ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_NETBIOS, NDPI_PROTOCOL_UNKNOWN); -- 2.26.1
