Skip to contentSkip to conversation

Hardened down-root.so plug-in with more context pointer checks

PATCH New David Sommerseth 1 participant 1 message Dec 9, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Hardened down-root.so plug-in with more context pointer checks

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Make sure that the context is pointing somewhere before continuing.

- ---

 plugin/down-root/down-root.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
plugin/down-root/down-root.c +0 -0
index 77497ad..000ac40 100644

- --- a/plugin/down-root/down-root.c
+++ b/plugin/down-root/down-root.c
@@ -274,6 +274,8 @@ openvpn_plugin_open_v1 (unsigned int *type_mask, const char *argv[], const char
* Allocate our context
*/
context = (struct down_root_context *) calloc (1, sizeof (struct
down_root_context));
+ if (!context)
+ goto exit;
context->foreground_fd = -1;

/*
@@ -317,6 +319,9 @@ openvpn_plugin_func_v1 (openvpn_plugin_handle_t handle, const int type, const ch
{
struct down_root_context *context = (struct down_root_context *) handle;

+ if (!context)
+ return OPENVPN_PLUGIN_FUNC_ERROR;
+
if (type == OPENVPN_PLUGIN_UP && context->foreground_fd == -1) /*
fork off a process to hold onto root */

     {
       pid_t pid;

@@ -409,6 +414,9 @@ openvpn_plugin_close_v1 (openvpn_plugin_handle_t handle)
{
struct down_root_context *context = (struct down_root_context *) handle;

+ if (!context)
+ return;
+
if (DEBUG (context->verb))

     fprintf (stderr, "DOWN-ROOT: close\n");

- --
1.6.2.5

(patch attached for convenience)
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org/

iEYEARECAAYFAksfdq4ACgkQDC186MBRfro7jgCgm3WM29OaAjIN1rnLbiFfEUm6 2pYAn3FVWu9++5Cl2lsT9FFJzvmop1T4
=Ywbn
-----END PGP SIGNATURE-----

From c67bb0fb0afb3045b2b07873583086d6dfbad8e9 Mon Sep 17 00:00:00 2001
From: David Sommerseth <[email protected]...>
Date: Wed, 9 Dec 2009 10:44:31 +0100
Subject: [PATCH] Hardened down-root.so plug-in with more context pointer checks

Make sure that the context is pointing somewhere before continuing.

---
 plugin/down-root/down-root.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
plugin/down-root/down-root.c +8 -0
index 77497ad..000ac40 100644
@@ -274,6 +274,8 @@ openvpn_plugin_open_v1 (unsigned int *type_mask, const char *argv[], const char
    * Allocate our context
    */
   context = (struct down_root_context *) calloc (1, sizeof (struct down_root_context));
+  if (!context)
+    goto exit;
   context->foreground_fd = -1;
 
   /*
@@ -317,6 +319,9 @@ openvpn_plugin_func_v1 (openvpn_plugin_handle_t handle, const int type, const ch
 {
   struct down_root_context *context = (struct down_root_context *) handle;
 
+  if (!context)
+    return OPENVPN_PLUGIN_FUNC_ERROR;
+
   if (type == OPENVPN_PLUGIN_UP && context->foreground_fd == -1) /* fork off a process to hold onto root */
     {
       pid_t pid;
@@ -409,6 +414,9 @@ openvpn_plugin_close_v1 (openvpn_plugin_handle_t handle)
 {
   struct down_root_context *context = (struct down_root_context *) handle;
 
+  if (!context)
+    return;
+
   if (DEBUG (context->verb))
     fprintf (stderr, "DOWN-ROOT: close\n");
 
Signature · 1 line
1.6.2.5