Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1557)

Unified Diff: sandbox/linux/suid/common/suid_unsafe_environment_variables.h

Issue 10807059: Refactor the setuid sandbox client code to its own class. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address reviewer's comments and other minor nits. Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sandbox/linux/suid/common/sandbox.h ('k') | sandbox/linux/suid/sandbox.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sandbox/linux/suid/common/suid_unsafe_environment_variables.h
diff --git a/sandbox/linux/suid/suid_unsafe_environment_variables.h b/sandbox/linux/suid/common/suid_unsafe_environment_variables.h
similarity index 85%
rename from sandbox/linux/suid/suid_unsafe_environment_variables.h
rename to sandbox/linux/suid/common/suid_unsafe_environment_variables.h
index 4e3329f439357308fc227318b30aa09e8c4b2f11..ee4db76c299a239077767af6e5a24907b63580bb 100644
--- a/sandbox/linux/suid/suid_unsafe_environment_variables.h
+++ b/sandbox/linux/suid/common/suid_unsafe_environment_variables.h
@@ -16,6 +16,14 @@
#ifndef SANDBOX_LINUX_SUID_SUID_UNSAFE_ENVIRONMENT_VARIABLES_H_
#define SANDBOX_LINUX_SUID_SUID_UNSAFE_ENVIRONMENT_VARIABLES_H_
+#if defined(__cplusplus)
+#include <limits>
+#define SIZE_MAX std::numeric_limits<size_t>::max()
+#endif
+
+#include <stdlib.h> // malloc
+#include <string.h> // memcpy
+
static const char* kSUIDUnsafeEnvironmentVariables[] = {
"LD_AOUT_LIBRARY_PATH",
"LD_AOUT_PRELOAD",
@@ -48,8 +56,12 @@ static const char* kSUIDUnsafeEnvironmentVariables[] = {
// name for a given environment variable.
static inline char* SandboxSavedEnvironmentVariable(const char* envvar) {
const size_t envvar_len = strlen(envvar);
+
+ if (envvar_len > SIZE_MAX - 1 -8)
+ return NULL;
+
const size_t saved_envvarlen = envvar_len + 1 /* NUL terminator */ +
- 8 /* strlen("SANDBOX_") */;
+ 8 /* strlen("SANDBOX_") */;
char* const saved_envvar = (char*) malloc(saved_envvarlen);
if (!saved_envvar)
return NULL;
@@ -61,4 +73,8 @@ static inline char* SandboxSavedEnvironmentVariable(const char* envvar) {
return saved_envvar;
}
+#if defined(__cplusplus)
+#undef SIZE_MAX
+#endif
+
#endif // SANDBOX_LINUX_SUID_SUID_UNSAFE_ENVIRONMENT_VARIABLES_H_
« no previous file with comments | « sandbox/linux/suid/common/sandbox.h ('k') | sandbox/linux/suid/sandbox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698