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/seap-packet.c.patch
author zihao.zhu@oracle.com <zihao.zhu@oracle.com>
Wed, 18 May 2016 13:41:53 -0700
changeset 6023 1285c8b9e736
parent 4893 95c28fe27246
permissions -rw-r--r--
23284011 openldap upgrade breaks userland build
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4893
95c28fe27246 21810433 fix memory management issues with SEAP in openscap
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
     1
 
This patch fixes some memory management issues with
95c28fe27246 21810433 fix memory management issues with SEAP in openscap
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
     2
 
SEAP. This patch has not been contributed upstream
95c28fe27246 21810433 fix memory management issues with SEAP in openscap
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
     3
 
but will be done by 2015-09-30.
95c28fe27246 21810433 fix memory management issues with SEAP in openscap
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
     4
 
--- openscap-1.2.3/src/OVAL/probes/SEAP/seap-packet.c.~1~	2015-09-09 08:47:22.067689406 -0700
95c28fe27246 21810433 fix memory management issues with SEAP in openscap
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
     5
 
+++ openscap-1.2.3/src/OVAL/probes/SEAP/seap-packet.c	2015-09-09 08:47:46.696514370 -0700
95c28fe27246 21810433 fix memory management issues with SEAP in openscap
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
     6
 
@@ -730,7 +730,6 @@
95c28fe27246 21810433 fix memory management issues with SEAP in openscap
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
     7
 
                         } else {
95c28fe27246 21810433 fix memory management issues with SEAP in openscap
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
     8
 
                                 SEXP_list_free (sexp_buffer);
95c28fe27246 21810433 fix memory management issues with SEAP in openscap
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
     9
 
                                 SEXP_psetup_free (psetup);
95c28fe27246 21810433 fix memory management issues with SEAP in openscap
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    10
 
-				SEXP_free(sexp_buffer);
95c28fe27246 21810433 fix memory management issues with SEAP in openscap
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    11
 
                                 dI("eloop_restart\n");
95c28fe27246 21810433 fix memory management issues with SEAP in openscap
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    12
 
                                 goto eloop_start;
95c28fe27246 21810433 fix memory management issues with SEAP in openscap
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    13
 
                         }
95c28fe27246 21810433 fix memory management issues with SEAP in openscap
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    14
 
--- openscap-1.2.3/src/OVAL/probes/SEAP/sexp-value.c.~1~	2015-09-10 15:14:06.694228778 -0700
95c28fe27246 21810433 fix memory management issues with SEAP in openscap
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    15
 
+++ openscap-1.2.3/src/OVAL/probes/SEAP/sexp-value.c	2015-09-10 15:15:53.755827733 -0700
95c28fe27246 21810433 fix memory management issues with SEAP in openscap
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    16
 
@@ -119,7 +119,7 @@
95c28fe27246 21810433 fix memory management issues with SEAP in openscap
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    17
 
         _A(sz < 16);
95c28fe27246 21810433 fix memory management issues with SEAP in openscap
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    18
95c28fe27246 21810433 fix memory management issues with SEAP in openscap
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    19
 
         if (sm_memalign ((void **)(void *)&lblk, SEXP_LBLK_ALIGN,
95c28fe27246 21810433 fix memory management issues with SEAP in openscap
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    20
 
-                         sizeof (uintptr_t) + (2 * sizeof (uint16_t)) + (sizeof (SEXP_t) * (1 << sz))) != 0) {
95c28fe27246 21810433 fix memory management issues with SEAP in openscap
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    21
 
+                         sizeof (struct SEXP_val_lblk) + (sizeof (SEXP_t) * (1 << sz))) != 0) {
95c28fe27246 21810433 fix memory management issues with SEAP in openscap
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    22
 
                 /* TODO: handle this */
95c28fe27246 21810433 fix memory management issues with SEAP in openscap
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    23
 
                 abort ();
95c28fe27246 21810433 fix memory management issues with SEAP in openscap
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    24
 
                 return ((uintptr_t) NULL);
upstream/oracle/userland-gate