Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29707b20 authored by Jingoo Han's avatar Jingoo Han Committed by James Morris
Browse files

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: default avatarJingoo Han <jg1.han@samsung.com>
Signed-off-by: default avatarJames Morris <james.l.morris@oracle.com>
parent 923b49ff

security/apparmor/lsm.c

+1 −1
Original line number Diff line number Diff line
@@ -751,7 +751,7 @@ module_param_named(enabled, apparmor_enabled, bool, S_IRUGO); 
static int __init apparmor_enabled_setup(char *str)

{

	unsigned long enabled;

	int error = strict_strtoul(str, 0, &enabled);

	int error = kstrtoul(str, 0, &enabled);

	if (!error)

		apparmor_enabled = enabled ? 1 : 0;

	return 1;

security/integrity/ima/ima_policy.c

+3 −3
Original line number Diff line number Diff line
@@ -520,7 +520,7 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry) 
				break;

			}



			result = strict_strtoul(args[0].from, 16,

			result = kstrtoul(args[0].from, 16,

						&entry->fsmagic);

			if (!result)

				entry->flags |= IMA_FSMAGIC;
@@ -547,7 +547,7 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry) 
				break;

			}



			result = strict_strtoul(args[0].from, 10, &lnum);

			result = kstrtoul(args[0].from, 10, &lnum);

			if (!result) {

				entry->uid = make_kuid(current_user_ns(), (uid_t)lnum);

				if (!uid_valid(entry->uid) || (((uid_t)lnum) != lnum))
@@ -564,7 +564,7 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry) 
				break;

			}



			result = strict_strtoul(args[0].from, 10, &lnum);

			result = kstrtoul(args[0].from, 10, &lnum);

			if (!result) {

				entry->fowner = make_kuid(current_user_ns(), (uid_t)lnum);

				if (!uid_valid(entry->fowner) || (((uid_t)lnum) != lnum))

security/integrity/integrity_audit.c

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ static int __init integrity_audit_setup(char *str) 
{

	unsigned long audit;



	if (!strict_strtoul(str, 0, &audit))

	if (!kstrtoul(str, 0, &audit))

		integrity_audit_info = audit ? 1 : 0;

	return 1;

}

security/keys/encrypted-keys/encrypted.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

security/keys/trusted.c

+3 −3
Original line number Diff line number Diff line
@@ -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;