diff options
| author | Paul Moore <pmoore@redhat.com> | 2014-06-17 23:30:23 +0200 |
|---|---|---|
| committer | Paul Moore <pmoore@redhat.com> | 2014-06-17 23:30:23 +0200 |
| commit | 170b5910d9fbea79de1bb40df22eda5f98250c0c (patch) | |
| tree | ca9560e878d2842d45c6f99077d0d8b8f8b0f9ba /security/keys/encrypted-keys | |
| parent | selinux: conditionally reschedule in hashtab_insert while loading selinux policy (diff) | |
| parent | Linux 3.15 (diff) | |
| download | linux-170b5910d9fbea79de1bb40df22eda5f98250c0c.tar.xz linux-170b5910d9fbea79de1bb40df22eda5f98250c0c.zip | |
Merge tag 'v3.15' into next
Linux 3.15
Diffstat (limited to 'security/keys/encrypted-keys')
| -rw-r--r-- | security/keys/encrypted-keys/encrypted.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/keys/encrypted-keys/encrypted.c b/security/keys/encrypted-keys/encrypted.c index 9e1e005c7596..5fe443d120af 100644 --- a/security/keys/encrypted-keys/encrypted.c +++ b/security/keys/encrypted-keys/encrypted.c @@ -609,7 +609,7 @@ static struct encrypted_key_payload *encrypted_key_alloc(struct key *key, long dlen; int ret; - ret = strict_strtol(datalen, 10, &dlen); + ret = kstrtol(datalen, 10, &dlen); if (ret < 0 || dlen < MIN_DATA_SIZE || dlen > MAX_DATA_SIZE) return ERR_PTR(-EINVAL); |