diff options
| author | Jingoo Han <jg1.han@samsung.com> | 2014-02-05 07:13:14 +0100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-02-06 09:11:04 +0100 |
| commit | 29707b206c5171ac6583a4d1e9ec3af937e8c2e4 (patch) | |
| tree | 89eaafa4bfc49b2418db3bdfb367e65f643d2e79 /security/keys/trusted.c | |
| parent | Merge branch 'master' of git://git.infradead.org/users/pcmoore/selinux into next (diff) | |
| download | linux-29707b206c5171ac6583a4d1e9ec3af937e8c2e4.tar.xz linux-29707b206c5171ac6583a4d1e9ec3af937e8c2e4.zip | |
security: replace strict_strto*() with kstrto*()
The usage of strict_strto*() is not preferred, because
strict_strto*() is obsolete. Thus, kstrto*() should be
used.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: James Morris <james.l.morris@oracle.com>
Diffstat (limited to 'security/keys/trusted.c')
| -rw-r--r-- | security/keys/trusted.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/security/keys/trusted.c b/security/keys/trusted.c index e13fcf7636f7..6b804aa4529a 100644 --- a/security/keys/trusted.c +++ b/security/keys/trusted.c @@ -753,7 +753,7 @@ static int getoptions(char *c, struct trusted_key_payload *pay, return -EINVAL; break; case Opt_keyhandle: - res = strict_strtoul(args[0].from, 16, &handle); + res = kstrtoul(args[0].from, 16, &handle); if (res < 0) return -EINVAL; opt->keytype = SEAL_keytype; @@ -782,7 +782,7 @@ static int getoptions(char *c, struct trusted_key_payload *pay, return -EINVAL; break; case Opt_pcrlock: - res = strict_strtoul(args[0].from, 10, &lock); + res = kstrtoul(args[0].from, 10, &lock); if (res < 0) return -EINVAL; opt->pcrlock = lock; @@ -820,7 +820,7 @@ static int datablob_parse(char *datablob, struct trusted_key_payload *p, c = strsep(&datablob, " \t"); if (!c) return -EINVAL; - ret = strict_strtol(c, 10, &keylen); + ret = kstrtol(c, 10, &keylen); if (ret < 0 || keylen < MIN_KEY_SIZE || keylen > MAX_KEY_SIZE) return -EINVAL; p->key_len = keylen; |