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

Message-ID: <20151119120615.13b6ce0b@canb.auug.org.au>
Date:	Thu, 19 Nov 2015 12:06:15 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Paul Moore <paul@...l-moore.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Mel Gorman <mgorman@...hsingularity.net>,
	Andrew Morton <akpm@...ux-foundation.org>,
	Richard Guy Briggs <rgb@...hat.com>
Subject: linux-next: manual merge of the audit tree with Linus' tree

Hi Paul,

Today's linux-next merge of the audit tree got a conflict in:

  kernel/audit.c

between commit:

  d0164adc89f6 ("mm, page_alloc: distinguish between being unable to sleep, unwilling to sleep and avoiding waking kswapd")

from Linus' tree and commit:

  14eeba1d242e ("audit: include auditd's threads in audit_log_start() wait exception")

from the audit tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc kernel/audit.c
index bc2ff61bc1d6,ca1b9cda2766..000000000000
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@@ -1371,9 -1371,9 +1371,9 @@@ struct audit_buffer *audit_log_start(st
  	if (unlikely(audit_filter_type(type)))
  		return NULL;
  
 -	if (gfp_mask & __GFP_WAIT) {
 +	if (gfp_mask & __GFP_DIRECT_RECLAIM) {
- 		if (audit_pid && audit_pid == current->pid)
+ 		if (audit_pid && audit_pid == current->tgid)
 -			gfp_mask &= ~__GFP_WAIT;
 +			gfp_mask &= ~__GFP_DIRECT_RECLAIM;
  		else
  			reserve = 0;
  	}
--
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/