Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/openscap/patches/icache.c.patch
author Jacob Varughese <jacob.varughese@oracle.com>
Wed, 11 Nov 2015 11:24:50 -0800
changeset 5079 5d18f62e9f8a
permissions -rw-r--r--
21928864 oscap is limited to processing 32K records due to memory checks in the code 22181073 putback fixes to Makefile that got lost in merge, also remove building 32-bit 22181120 fix smfproperty probe to build with debug flags
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5079
5d18f62e9f8a 21928864 oscap is limited to processing 32K records due to memory checks in the code
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
     1
 
This fix addresses an issue in openscap which is meant
5d18f62e9f8a 21928864 oscap is limited to processing 32K records due to memory checks in the code
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
     2
 
to handle systems with small memory configurations. But
5d18f62e9f8a 21928864 oscap is limited to processing 32K records due to memory checks in the code
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
     3
 
on solaris we are not choosing to limit the applications
5d18f62e9f8a 21928864 oscap is limited to processing 32K records due to memory checks in the code
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
     4
 
memory usage. This has not been contributed upstream,
5d18f62e9f8a 21928864 oscap is limited to processing 32K records due to memory checks in the code
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
     5
 
but is intended to by 2015-Dec-15.
5d18f62e9f8a 21928864 oscap is limited to processing 32K records due to memory checks in the code
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
     6
 
--- openscap-1.2.3/src/OVAL/probes/probe/icache.c.~1~	2013-03-21 08:27:20.000000000 -0700
5d18f62e9f8a 21928864 oscap is limited to processing 32K records due to memory checks in the code
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
     7
 
+++ openscap-1.2.3/src/OVAL/probes/probe/icache.c	2015-11-06 14:06:01.150096481 -0800
5d18f62e9f8a 21928864 oscap is limited to processing 32K records due to memory checks in the code
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
     8
 
@@ -506,7 +506,8 @@
5d18f62e9f8a 21928864 oscap is limited to processing 32K records due to memory checks in the code
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
     9
 
 	cobj_itemcnt = SEXP_list_length(cobj_content);
5d18f62e9f8a 21928864 oscap is limited to processing 32K records due to memory checks in the code
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    10
 
 	SEXP_free(cobj_content);
5d18f62e9f8a 21928864 oscap is limited to processing 32K records due to memory checks in the code
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    11
5d18f62e9f8a 21928864 oscap is limited to processing 32K records due to memory checks in the code
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    12
 
-	if (probe_cobj_memcheck(cobj_itemcnt) != 0) {
5d18f62e9f8a 21928864 oscap is limited to processing 32K records due to memory checks in the code
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    13
 
+#if !defined (__sun)  && !defined  (__SVR4)
5d18f62e9f8a 21928864 oscap is limited to processing 32K records due to memory checks in the code
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    14
 
+	if (probe_cobj_memcheck(cobj_itemcnt) != 0) {
5d18f62e9f8a 21928864 oscap is limited to processing 32K records due to memory checks in the code
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    15
5d18f62e9f8a 21928864 oscap is limited to processing 32K records due to memory checks in the code
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    16
 
 		/*
5d18f62e9f8a 21928864 oscap is limited to processing 32K records due to memory checks in the code
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    17
 
 		 * Don't set the message again if the collected object is
5d18f62e9f8a 21928864 oscap is limited to processing 32K records due to memory checks in the code
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    18
 
@@ -532,6 +533,7 @@
5d18f62e9f8a 21928864 oscap is limited to processing 32K records due to memory checks in the code
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    19
5d18f62e9f8a 21928864 oscap is limited to processing 32K records due to memory checks in the code
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    20
 
 		return 2;
5d18f62e9f8a 21928864 oscap is limited to processing 32K records due to memory checks in the code
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    21
 
 	}
5d18f62e9f8a 21928864 oscap is limited to processing 32K records due to memory checks in the code
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    22
 
+#endif
5d18f62e9f8a 21928864 oscap is limited to processing 32K records due to memory checks in the code
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    23
5d18f62e9f8a 21928864 oscap is limited to processing 32K records due to memory checks in the code
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    24
 
         if (ctx->filters != NULL && probe_item_filtered(item, ctx->filters)) {
5d18f62e9f8a 21928864 oscap is limited to processing 32K records due to memory checks in the code
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    25
 
                 SEXP_free(item);
upstream/oracle/userland-gate