The branch, master has been updated
via 21eb516 vfs_virusfilter: Fix CID 1428738 Macro compares unsigned to 0
via 734404b vfs_virusfilter: Fix CID 1428740 Macro compares unsigned to 0
via 8a4409c vfs_virusfilter: Fix CID 1428739 Buffer not null terminated
from 9fc4712 s3: librpc: Allow client to correctly report etype
unsupported by KDC to caller.
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 21eb5169f46b8d819a5d5d028baff581e4e63de6
Author: Volker Lendecke <v...@samba.org>
Date: Tue Jan 30 12:37:30 2018 +0100
vfs_virusfilter: Fix CID 1428738 Macro compares unsigned to 0
vsnprintf returns "int" and not "size_t"
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
Autobuild-User(master): Jeremy Allison <j...@samba.org>
Autobuild-Date(master): Wed Jan 31 05:28:48 CET 2018 on sn-devel-144
commit 734404bbe911fd4aa6565b2a2aaecab4fbbf3c45
Author: Volker Lendecke <v...@samba.org>
Date: Tue Jan 30 12:36:14 2018 +0100
vfs_virusfilter: Fix CID 1428740 Macro compares unsigned to 0
vsnprintf returns "int" and not "size_t"
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 8a4409c956bdbe5d928e685b7c219566d467a627
Author: Volker Lendecke <v...@samba.org>
Date: Tue Jan 30 12:34:11 2018 +0100
vfs_virusfilter: Fix CID 1428739 Buffer not null terminated
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
source3/modules/vfs_virusfilter_utils.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/vfs_virusfilter_utils.c
b/source3/modules/vfs_virusfilter_utils.c
index 628e0ae..90ae427 100644
--- a/source3/modules/vfs_virusfilter_utils.c
+++ b/source3/modules/vfs_virusfilter_utils.c
@@ -148,10 +148,16 @@ bool virusfilter_io_connect_path(
struct sockaddr_un addr;
NTSTATUS status;
int socket, bes_result, flags, ret;
+ size_t len;
ZERO_STRUCT(addr);
addr.sun_family = AF_UNIX;
- strncpy(addr.sun_path, path, sizeof(addr.sun_path));
+
+ len = strlcpy(addr.sun_path, path, sizeof(addr.sun_path));
+ if (len >= sizeof(addr.sun_path)) {
+ io_h->stream = NULL;
+ return false;
+ }
status = open_socket_out((struct sockaddr_storage *)&addr, 0,
io_h->connect_timeout,
@@ -389,7 +395,7 @@ bool virusfilter_io_writefl(
{
va_list ap;
char data[VIRUSFILTER_IO_BUFFER_SIZE + VIRUSFILTER_IO_EOL_SIZE];
- size_t data_size;
+ int data_size;
va_start(ap, data_fmt);
data_size = vsnprintf(data, VIRUSFILTER_IO_BUFFER_SIZE, data_fmt, ap);
@@ -411,7 +417,7 @@ bool virusfilter_io_vwritefl(
const char *data_fmt, va_list ap)
{
char data[VIRUSFILTER_IO_BUFFER_SIZE + VIRUSFILTER_IO_EOL_SIZE];
- size_t data_size;
+ int data_size;
data_size = vsnprintf(data, VIRUSFILTER_IO_BUFFER_SIZE, data_fmt, ap);
--
Samba Shared Repository
