| commit | 5c8c40be4b5a2944483bfc1a45d6c3fa02551af3 | [log] [tgz] |
|---|---|---|
| author | James Morris <jmorris@namei.org> | Mon Jan 05 08:56:01 2009 +1100 |
| committer | James Morris <jmorris@namei.org> | Mon Jan 05 08:56:01 2009 +1100 |
| tree | d9a79fae500aa5172df7446a2c7a7bdd4e4d469c | |
| parent | 90bd49ab6649269cd10d0edc86d0e0f62864726a [diff] | |
| parent | 6d3dc07cbb1e88deed2e8710e215f232a56b1dce [diff] |
Merge branch 'master' of git://git.infradead.org/users/pcmoore/lblnet-2.6_next into next
diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c index 6688765..0979679 100644 --- a/security/keys/keyctl.c +++ b/security/keys/keyctl.c
@@ -1294,7 +1294,7 @@ case KEYCTL_GET_SECURITY: return keyctl_get_security((key_serial_t) arg2, - (char *) arg3, + (char __user *) arg3, (size_t) arg4); default: