diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-04-19 12:17:29 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-04-19 12:17:29 -0400 |
| commit | adf6d34e460387ee3e8f1e1875d52bff51212c7d (patch) | |
| tree | 88ef100143e6184103a608f82dfd232bf6376eaf /kernel/audit.c | |
| parent | d1964dab60ce7c104dd21590e987a8787db18051 (diff) | |
| parent | 3760d31f11bfbd0ead9eaeb8573e0602437a9d7c (diff) | |
Merge branch 'omap2-upstream' into devel
Diffstat (limited to 'kernel/audit.c')
| -rw-r--r-- | kernel/audit.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/audit.c b/kernel/audit.c index be55cb503633..b782b046543d 100644 --- a/kernel/audit.c +++ b/kernel/audit.c | |||
| @@ -1269,8 +1269,8 @@ static void audit_log_n_string(struct audit_buffer *ab, size_t slen, | |||
| 1269 | 1269 | ||
| 1270 | /** | 1270 | /** |
| 1271 | * audit_string_contains_control - does a string need to be logged in hex | 1271 | * audit_string_contains_control - does a string need to be logged in hex |
| 1272 | * @string - string to be checked | 1272 | * @string: string to be checked |
| 1273 | * @len - max length of the string to check | 1273 | * @len: max length of the string to check |
| 1274 | */ | 1274 | */ |
| 1275 | int audit_string_contains_control(const char *string, size_t len) | 1275 | int audit_string_contains_control(const char *string, size_t len) |
| 1276 | { | 1276 | { |
| @@ -1285,7 +1285,7 @@ int audit_string_contains_control(const char *string, size_t len) | |||
| 1285 | /** | 1285 | /** |
| 1286 | * audit_log_n_untrustedstring - log a string that may contain random characters | 1286 | * audit_log_n_untrustedstring - log a string that may contain random characters |
| 1287 | * @ab: audit_buffer | 1287 | * @ab: audit_buffer |
| 1288 | * @len: lenth of string (not including trailing null) | 1288 | * @len: length of string (not including trailing null) |
| 1289 | * @string: string to be logged | 1289 | * @string: string to be logged |
| 1290 | * | 1290 | * |
| 1291 | * This code will escape a string that is passed to it if the string | 1291 | * This code will escape a string that is passed to it if the string |