linux-kernel - [Patch 2/2] vfs: allow file truncations when both suid and write permissions set

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20090817071022.5913.63840.sendpatchset@localhost.localdomain>
Date:	Mon, 17 Aug 2009 03:07:58 -0400
From:	Amerigo Wang <amwang@...hat.com>
To:	linux-kernel@...r.kernel.org
Cc:	esandeen@...hat.com, eteo@...hat.com, eparis@...hat.com,
	Amerigo Wang <amwang@...hat.com>,
	linux-fsdevel@...r.kernel.org, akpm@...ux-foundation.org,
	sds@...ho.nsa.gov, hirofumi@...l.parknet.co.jp,
	viro@...iv.linux.org.uk
Subject: [Patch 2/2] vfs: allow file truncations when both suid and write permissions set


With patch 1/2 applied, now we can just simply add ATTR_FORCE flag, to
remove suid on truncation.

Signed-off-by: WANG Cong <amwang@...hat.com>
Cc: Eric Sandeen <esandeen@...hat.com>
Cc: Eric Paris <eparis@...hat.com>
Cc: Eugene Teo <eteo@...hat.com>
Cc: Al Viro <viro@...iv.linux.org.uk>
Cc: OGAWA Hirofumi <hirofumi@...l.parknet.co.jp>

---
diff --git a/fs/open.c b/fs/open.c
index dd98e80..cea9abf 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -199,7 +199,7 @@ out:
 int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
 	struct file *filp)
 {
-	int err;
+	int ret;
 	struct iattr newattrs;
 
 	/* Not pretty: "inode->i_size" shouldn't really be signed. But it is. */
@@ -214,12 +214,15 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
 	}
 
 	/* Remove suid/sgid on truncate too */
-	newattrs.ia_valid |= should_remove_suid(dentry);
+	ret = should_remove_suid(dentry);
+	newattrs.ia_valid |= ret;
+	if (ret)
+		newattrs.ia_valid |= ATTR_FORCE;
 
 	mutex_lock(&dentry->d_inode->i_mutex);
-	err = notify_change(dentry, &newattrs);
+	ret = notify_change(dentry, &newattrs);
 	mutex_unlock(&dentry->d_inode->i_mutex);
-	return err;
+	return ret;
 }
 
 static long do_sys_truncate(const char __user *pathname, loff_t length)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/