Hi Alexey,
Today's linux-next merge of the proc tree got a conflict in
fs/proc/base.c between commit c69e8d9c01db2adc503464993c358901c9af9de4
("CRED: Use RCU to access another task's creds and to release a task's
own creds") from the security-testing tree and commit
e19b45ac5884142791216739fa077cebe626e085 ("proc: don't show the
wrong /proc/net after unshare") from the proc tree.
Just a trivial overlap. I fixed it up (see below) and can carry the fix.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
diff --cc fs/proc/base.c
index cf42c42,250154f..0000000
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@@ -1490,8 -1510,7 +1517,9 @@@ static int pid_revalidate(struct dentr
{
struct inode *inode = dentry->d_inode;
struct task_struct *task = get_proc_task(inode);
+ const struct cred *cred;
+ int ret = 0;
+
if (task) {
if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
task_dumpable(task)) {
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
