[SCM] Samba Shared Repository - branch master updated

[Ira Cooper]

The branch, master has been updated
       via  bccf5c9 perfcount: Fix CID 1035494 Out-of-bounds read
       via  819d4b4 perfcount: Fix CID 1035493 Out-of-bounds read
       via  bd3b2c3 perfcount: Fix CID 1035492 Out-of-bounds read
       via  5968310 perfcount: Fix CID 1274043 Division or modulo by zero
      from  fb86aa8 printing: increse log level for unreachable cups servers

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit bccf5c9a7bc18b859f262307ab6a2b6edaca0588
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Mar 5 11:12:38 2015 +0100

    perfcount: Fix CID 1035494 Out-of-bounds read
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Ira Cooper <ira at samba.org>
    
    Autobuild-User(master): Ira Cooper <ira at samba.org>
    Autobuild-Date(master): Thu Mar  5 18:28:44 CET 2015 on sn-devel-104

commit 819d4b4bcd71ea82930365df33cc4b76a4835130
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Mar 5 11:11:59 2015 +0100

    perfcount: Fix CID 1035493 Out-of-bounds read
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Ira Cooper <ira at samba.org>

commit bd3b2c3d9b09f385a74ee80b1d87b1a71428c162
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Mar 5 11:10:35 2015 +0100

    perfcount: Fix CID 1035492 Out-of-bounds read
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Ira Cooper <ira at samba.org>

commit 5968310060ddc298835a8ee720ae7fe68aece1b9
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Mar 5 11:07:56 2015 +0100

    perfcount: Fix CID 1274043 Division or modulo by zero
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Ira Cooper <ira at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 source3/modules/perfcount_test.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/perfcount_test.c b/source3/modules/perfcount_test.c
index c0b5336..0dc073c 100644
--- a/source3/modules/perfcount_test.c
+++ b/source3/modules/perfcount_test.c
@@ -69,7 +69,7 @@ static void perfcount_test_add_counters(struct perfcount_test_context *ctxt)
 
 		found = false;
 
-		if (ptc->op > MAX_OP)
+		if (ptc->op >= MAX_OP)
 			continue;
 
 		for (head = g_list[ptc->op]; head != NULL; head = head->next) {
@@ -132,13 +132,13 @@ static const char *smb_subop_name(int op, int subop)
 {
 	/* trans */
 	if (op == 0x25) {
-		if (subop > sizeof(trans_subop_table) /
+		if (subop >= sizeof(trans_subop_table) /
 		    sizeof(trans_subop_table[0])) {
 			return "unknown";
 		}
 		return trans_subop_table[subop];
 	} else if (op == 0x32) {
-		if (subop > sizeof(trans2_subop_table) /
+		if (subop >= sizeof(trans2_subop_table) /
 		    sizeof(trans2_subop_table[0])) {
 			return "unknown";
 		}
@@ -172,6 +172,10 @@ static void perfcount_test_dump_counters(void)
 	count_mod = lp_parm_int(0, PARM_PC_TEST_TYPE, PARM_DUMPON_COUNT,
 	    PARM_DUMPON_COUNT_DEFAULT);
 
+	if (count_mod == 0) {
+		return;
+	}
+
 	if ((count++ % count_mod) != 0)
 		return;
 


-- 
Samba Shared Repository