forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2024-09-20 cf4ce59b3b70238352c7f1729f0f7223214828ad 
 kernel/security/smack/smack_lsm.c
....@@ -973,8 +973,9 @@
973973 				     const struct qstr *qstr, const char **name,
974974 				     void **value, size_t *len)
975975 {
976
+	struct task_smack *tsp = smack_cred(current_cred());
976977 	struct inode_smack *issp = smack_inode(inode);
977
-	struct smack_known *skp = smk_of_current();
978
+	struct smack_known *skp = smk_of_task(tsp);
978979 	struct smack_known *isp = smk_of_inode(inode);
979980 	struct smack_known *dsp = smk_of_inode(dir);
980981 	int may;
....@@ -983,20 +984,34 @@
983984 		*name = XATTR_SMACK_SUFFIX;
984985 
985986 	if (value && len) {
986
-		rcu_read_lock();
987
-		may = smk_access_entry(skp->smk_known, dsp->smk_known,
988
-				       &skp->smk_rules);
989
-		rcu_read_unlock();
987
+		/*
988
+		 * If equal, transmuting already occurred in
989
+		 * smack_dentry_create_files_as(). No need to check again.
990
+		 */
991
+		if (tsp->smk_task != tsp->smk_transmuted) {
992
+			rcu_read_lock();
993
+			may = smk_access_entry(skp->smk_known, dsp->smk_known,
994
+					       &skp->smk_rules);
995
+			rcu_read_unlock();
996
+		}
990997 
991998 		/*
992
-		 * If the access rule allows transmutation and
993
-		 * the directory requests transmutation then
994
-		 * by all means transmute.
999
+		 * In addition to having smk_task equal to smk_transmuted,
1000
+		 * if the access rule allows transmutation and the directory
1001
+		 * requests transmutation then by all means transmute.
9951002 		 * Mark the inode as changed.
9961003 		 */
997
-		if (may > 0 && ((may & MAY_TRANSMUTE) != 0) &&
998
-		    smk_inode_transmutable(dir)) {
999
-			isp = dsp;
1004
+		if ((tsp->smk_task == tsp->smk_transmuted) ||
1005
+		    (may > 0 && ((may & MAY_TRANSMUTE) != 0) &&
1006
+		     smk_inode_transmutable(dir))) {
1007
+			/*
1008
+			 * The caller of smack_dentry_create_files_as()
1009
+			 * should have overridden the current cred, so the
1010
+			 * inode label was already set correctly in
1011
+			 * smack_inode_alloc_security().
1012
+			 */
1013
+			if (tsp->smk_task != tsp->smk_transmuted)
1014
+				isp = dsp;
10001015 			issp->smk_flags |= SMK_INODE_CHANGED;
10011016 		}
10021017 
....@@ -1430,10 +1445,19 @@
14301445 	struct super_block *sbp;
14311446 	struct inode *ip = (struct inode *)inode;
14321447 	struct smack_known *isp;
1448
+	struct inode_smack *ispp;
1449
+	size_t label_len;
1450
+	char *label = NULL;
14331451 
1434
-	if (strcmp(name, XATTR_SMACK_SUFFIX) == 0)
1452
+	if (strcmp(name, XATTR_SMACK_SUFFIX) == 0) {
14351453 		isp = smk_of_inode(inode);
1436
-	else {
1454
+	} else if (strcmp(name, XATTR_SMACK_TRANSMUTE) == 0) {
1455
+		ispp = smack_inode(inode);
1456
+		if (ispp->smk_flags & SMK_INODE_TRANSMUTE)
1457
+			label = TRANS_TRUE;
1458
+		else
1459
+			label = "";
1460
+	} else {
14371461 		/*
14381462 		 * The rest of the Smack xattrs are only on sockets.
14391463 		 */
....@@ -1455,13 +1479,18 @@
14551479 			return -EOPNOTSUPP;
14561480 	}
14571481 
1482
+	if (!label)
1483
+		label = isp->smk_known;
1484
+
1485
+	label_len = strlen(label);
1486
+
14581487 	if (alloc) {
1459
-		*buffer = kstrdup(isp->smk_known, GFP_KERNEL);
1488
+		*buffer = kstrdup(label, GFP_KERNEL);
14601489 		if (*buffer == NULL)
14611490 			return -ENOMEM;
14621491 	}
14631492 
1464
-	return strlen(isp->smk_known);
1493
+	return label_len;
14651494 }
14661495 
14671496 
....@@ -4635,7 +4664,7 @@
46354664 	/*
46364665 	 * Get label from overlay inode and set it in create_sid
46374666 	 */
4638
-	isp = smack_inode(d_inode(dentry->d_parent));
4667
+	isp = smack_inode(d_inode(dentry));
46394668 	skp = isp->smk_inode;
46404669 	tsp->smk_task = skp;
46414670 	*new = new_creds;
....@@ -4686,8 +4715,10 @@
46864715 		 * providing access is transmuting use the containing
46874716 		 * directory label instead of the process label.
46884717 		 */
4689
-		if (may > 0 && (may & MAY_TRANSMUTE))
4718
+		if (may > 0 && (may & MAY_TRANSMUTE)) {
46904719 			ntsp->smk_task = isp->smk_inode;
4720
+			ntsp->smk_transmuted = ntsp->smk_task;
4721
+		}
46914722 	}
46924723 	return 0;
46934724 }