selinux/stable-5.19 PR 20220616

-----BEGIN PGP SIGNATURE-----
 
 iQJIBAABCAAyFiEES0KozwfymdVUl37v6iDy2pc3iXMFAmKrfrAUHHBhdWxAcGF1
 bC1tb29yZS5jb20ACgkQ6iDy2pc3iXMyTg//ab9SAoIJ+xjJ11pK70AkUpsPDUgS
 B/ik62HuH9AlKVHttYzifb9f+ezqYPPkNurBbthlx83KJczkHxXP7ZCN76RFlq6B
 NG4P1bP3Y3iD/U2QPE2kGBMkqsMjP8dTVzJ9Hun/XAsFfNuGe8sDCfF+bA6lDFWJ
 8LDj124+vx1RBQbRdguO4BjX0TVApidHqEQI4IkZZA+enqVZLeBUvS6nxW3qgGnR
 RSCCKjZBNOJxU8A0chZ90D4YpN91GdM2B402BF6BgnZVe7YWoyoyK/puRkWqfiiB
 /dWOQ1NiYiWJbVkIdIQskGWaVzco0hDBQjLcfldpolpfbcrJvgoWAVNhwVmdkQwh
 guGm3ZMQdbuf5aDdY8/TogHdRdXXhhMogoWZS/AnZb4BmiJyDLDEc+YIhqUJAyZ/
 Kz1Mp+1eDMgx+e8LELM2Qr+TMAwXEeCQq5Hp7b9QlFloZnZoJh/XaepPbYYSU2me
 HqscQnthS402+xzD2ra0q6K8zxPTuSs9VB++6J5w/RzV3dGEbe2u1ILSoYd55DG2
 qpRVR+LA3qoRf8uGe2eT9geIG2tbmqfBixfxnqxdKn9eIxv3pwKBKeWCWcSSIQQO
 J5PsBn9vnmqCmrX4B9+hSeRj2S9kBwhbOAGmjCag5p+RDv9gR46p78rGRfUOioOu
 ZNuVUCQTOyJ2+SM=
 =JqDZ
 -----END PGP SIGNATURE-----

Merge tag 'selinux-pr-20220616' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux

Pull selinux fix from Paul Moore:
 "A single SELinux patch to fix memory leaks when mounting filesystems
  with SELinux mount options"

* tag 'selinux-pr-20220616' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux:
  selinux: free contexts previously transferred in selinux_add_opt()

security/selinux/hooks.c

@@ -2600,8 +2600,9 @@ static int selinux_sb_eat_lsm_opts(char *options, void **mnt_opts)
 				}
 			}
 			rc = selinux_add_opt(token, arg, mnt_opts);
+			kfree(arg);
+			arg = NULL;
 			if (unlikely(rc)) {
-				kfree(arg);
 				goto free_opt;
 			}
 		} else {
@@ -2792,17 +2793,13 @@ static int selinux_fs_context_parse_param(struct fs_context *fc,
 					  struct fs_parameter *param)
 {
 	struct fs_parse_result result;
-	int opt, rc;
+	int opt;
 
 	opt = fs_parse(fc, selinux_fs_parameters, param, &result);
 	if (opt < 0)
 		return opt;
 
-	rc = selinux_add_opt(opt, param->string, &fc->security);
-	if (!rc)
-		param->string = NULL;
-
-	return rc;
+	return selinux_add_opt(opt, param->string, &fc->security);
 }
 
 /* inode security operations */