linux-kernel - linux-next: manual merge of the limits tree with the 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-next>] [day] [month] [year] [list]

Message-Id: <20091219094616.744fc1c1.sfr@canb.auug.org.au>
Date:	Sat, 19 Dec 2009 09:46:16 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jiri Slaby <jirislaby@...il.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Andrew Morton <akpm@...ux-foundation.org>,
	Masami Hiramatsu <mhiramat@...hat.com>
Subject: linux-next: manual merge of the limits tree with the  tree

Hi Jiri,

Today's linux-next merge of the limits tree got a conflict in fs/exec.c
between commit f6151dfea21496d43dbaba32cfcd9c9f404769bc ("mm: introduce
coredump parameter structure") from the  tree and commit
1157605c47673fc63b052df4688697695a9873d5 ("FS: use helpers for rlimits")
from the limits tree.

I fixed it up (see below - thanks Andrew) and can carry the fix for a
while.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc fs/exec.c
index ac52447,8a160a1..0000000
--- a/fs/exec.c
+++ b/fs/exec.c
@@@ -1772,11 -1763,6 +1772,11 @@@ void do_coredump(long signr, int exit_c
  	int helper_argc = 0;
  	int dump_count = 0;
  	static atomic_t core_dump_count = ATOMIC_INIT(0);
 +	struct coredump_params cprm = {
 +		.signr = signr,
 +		.regs = regs,
- 		.limit = current->signal->rlim[RLIMIT_CORE].rlim_cur,
++		.limit = rlimit(RLIMIT_CORE),
 +	};
  
  	audit_core_dumps(signr);
  

Content of type "application/pgp-signature" skipped