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, 24 Feb 2016 14:19:35 -0800
branchs11u3-sru
changeset 5494 4d99913076de
permissions -rw-r--r--
22188277 upgrade openscap to 1.2.6 21051102 Need smfproperty probe to check smfproperty values in OVAL 21928864 oscap is limited to processing 32K records due to memory checks in the code 21636352 Fix the cpe OVAL checks
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5494
4d99913076de 22188277 upgrade openscap to 1.2.6
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
     1
 
This fix addresses an issue in openscap which is meant
4d99913076de 22188277 upgrade openscap to 1.2.6
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
     2
 
to handle systems with small memory configurations. But
4d99913076de 22188277 upgrade openscap to 1.2.6
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
     3
 
on solaris we are not choosing to limit the applications
4d99913076de 22188277 upgrade openscap to 1.2.6
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
     4
 
memory usage. This has not been contributed upstream,
4d99913076de 22188277 upgrade openscap to 1.2.6
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
     5
 
but is intended to by 2016-Mar-15.
4d99913076de 22188277 upgrade openscap to 1.2.6
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
4d99913076de 22188277 upgrade openscap to 1.2.6
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
4d99913076de 22188277 upgrade openscap to 1.2.6
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
     8
 
@@ -506,7 +506,8 @@
4d99913076de 22188277 upgrade openscap to 1.2.6
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
     9
 
 	cobj_itemcnt = SEXP_list_length(cobj_content);
4d99913076de 22188277 upgrade openscap to 1.2.6
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    10
 
 	SEXP_free(cobj_content);
4d99913076de 22188277 upgrade openscap to 1.2.6
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    11
4d99913076de 22188277 upgrade openscap to 1.2.6
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    12
 
-	if (probe_cobj_memcheck(cobj_itemcnt) != 0) {
4d99913076de 22188277 upgrade openscap to 1.2.6
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    13
 
+#if !defined (__sun)  && !defined  (__SVR4)
4d99913076de 22188277 upgrade openscap to 1.2.6
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    14
 
+	if (probe_cobj_memcheck(cobj_itemcnt) != 0) {
4d99913076de 22188277 upgrade openscap to 1.2.6
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    15
4d99913076de 22188277 upgrade openscap to 1.2.6
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    16
 
 		/*
4d99913076de 22188277 upgrade openscap to 1.2.6
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    17
 
 		 * Don't set the message again if the collected object is
4d99913076de 22188277 upgrade openscap to 1.2.6
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    18
 
@@ -532,6 +533,7 @@
4d99913076de 22188277 upgrade openscap to 1.2.6
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    19
4d99913076de 22188277 upgrade openscap to 1.2.6
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    20
 
 		return 2;
4d99913076de 22188277 upgrade openscap to 1.2.6
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    21
 
 	}
4d99913076de 22188277 upgrade openscap to 1.2.6
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    22
 
+#endif
4d99913076de 22188277 upgrade openscap to 1.2.6
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    23
4d99913076de 22188277 upgrade openscap to 1.2.6
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    24
 
         if (ctx->filters != NULL && probe_item_filtered(item, ctx->filters)) {
4d99913076de 22188277 upgrade openscap to 1.2.6
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    25
 
                 SEXP_free(item);
upstream/oracle/userland-gate