diff options
author | David S. Miller <davem@davemloft.net> | 2008-04-03 17:33:42 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-04-03 17:33:42 -0400 |
commit | 3bb5da3837cc1aa17736b05139c9a22c3794851a (patch) | |
tree | c92d5684a866542b1cb20641607ac1643ce03a47 /kernel/audit.c | |
parent | 7feb49c82a74bc7c091b8ab2a3f96baa33d08ece (diff) | |
parent | 9597362d354f8655ece324b01d0c640a0e99c077 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
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 |