Commit 6859e21e authored by James Morris's avatar James Morris
Browse files

Merge branch 'smack-for-4.12' of git://github.com/cschaufler/smack-next into next

parents fa5b5b26 af96f0d6

security/smack/smack_access.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -504,7 +504,7 @@ int smk_netlbl_mls(int level, char *catset, struct netlbl_lsm_secattr *sap, 
			if ((m & *cp) == 0)

			if ((m & *cp) == 0)

				continue;

				continue;

			rc = netlbl_catmap_setbit(&sap->attr.mls.cat,

			rc = netlbl_catmap_setbit(&sap->attr.mls.cat,

						  cat, GFP_ATOMIC);

						  cat, GFP_KERNEL);

			if (rc < 0) {

			if (rc < 0) {

				netlbl_catmap_free(sap->attr.mls.cat);

				netlbl_catmap_free(sap->attr.mls.cat);

				return rc;

				return rc;

security/smack/smack_lsm.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -695,10 +695,8 @@ static int smack_parse_opts_str(char *options, 




	opts->mnt_opts_flags = kcalloc(NUM_SMK_MNT_OPTS, sizeof(int),

	opts->mnt_opts_flags = kcalloc(NUM_SMK_MNT_OPTS, sizeof(int),

			GFP_KERNEL);

			GFP_KERNEL);

	if (!opts->mnt_opts_flags) {

	if (!opts->mnt_opts_flags)

		kfree(opts->mnt_opts);

		goto out_err;

		goto out_err;

	}





	if (fsdefault) {

	if (fsdefault) {

		opts->mnt_opts[num_mnt_opts] = fsdefault;

		opts->mnt_opts[num_mnt_opts] = fsdefault;

CRA Git | Maintained and supported by SUSTech CRA and CCSE