linux-kernel - Re: linux-next: manual merge of the security-testing tree with Linus' tree

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: <7197.1273142988@redhat.com>
Date:	Thu, 06 May 2010 11:49:48 +0100
From:	David Howells <dhowells@...hat.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>,
	"Justin P. Mattock" <justinmattock@...il.com>
Cc:	dhowells@...hat.com, James Morris <jmorris@...ei.org>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Toshiyuki Okajima <toshi.okajima@...fujitsu.com>
Subject: Re: linux-next: manual merge of the security-testing tree with Linus' tree


Stephen Rothwell <sfr@...b.auug.org.au> wrote:

> I just used the version from Linus' tree.

Okay.

However, I'd like to NAK some bits of c5b60b5e67af8be4c58d3ffcc36894f69c4fbdc1
now that I see it...

	@@ -1282,16 +1282,16 @@ long keyctl_session_to_parent(void)
	 
	        /* the parent must have the same effective ownership and mustn't be
	         * SUID/SGID */
	-       if (pcred-> uid != mycred->euid ||
	+       if (pcred->uid  != mycred->euid ||
	            pcred->euid != mycred->euid ||
	            pcred->suid != mycred->euid ||
	-           pcred-> gid != mycred->egid ||
	+           pcred->gid  != mycred->egid ||
	            pcred->egid != mycred->egid ||
	            pcred->sgid != mycred->egid)
	                goto not_permitted;
	 
	        /* the keyrings must have the same UID */
	-       if (pcred ->tgcred->session_keyring->uid != mycred->euid ||
	+       if (pcred->tgcred->session_keyring->uid != mycred->euid ||
	            mycred->tgcred->session_keyring->uid != mycred->euid)
	                goto not_permitted;

_Please_ don't do either of these.  The whole point is to line stuff up so
that as the eye scans down the lines, it can easily pick out the differences
in stuff that's otherwise greatly repetitive.

David
--
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/