From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org,
Valdis Kletnieks <Valdis.Kletnieks@vt.edu>,
Richard Guy Briggs <rgb@redhat.com>,
Paul Moore <pmoore@redhat.com>
Subject: [PATCH 3.18 67/84] audit: use supplied gfp_mask from audit_buffer in kauditd_send_multicast_skb
Date: Tue, 6 Jan 2015 17:50:10 -0800 [thread overview]
Message-ID: <20150107014031.158563308@linuxfoundation.org> (raw)
In-Reply-To: <20150107014029.012974975@linuxfoundation.org>
3.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Richard Guy Briggs <rgb@redhat.com>
commit 54dc77d974a50147d6639dac6f59cb2c29207161 upstream.
Eric Paris explains: Since kauditd_send_multicast_skb() gets called in
audit_log_end(), which can come from any context (aka even a sleeping context)
GFP_KERNEL can't be used. Since the audit_buffer knows what context it should
use, pass that down and use that.
See: https://lkml.org/lkml/2014/12/16/542
BUG: sleeping function called from invalid context at mm/slab.c:2849
in_atomic(): 1, irqs_disabled(): 0, pid: 885, name: sulogin
2 locks held by sulogin/885:
#0: (&sig->cred_guard_mutex){+.+.+.}, at: [<ffffffff91152e30>] prepare_bprm_creds+0x28/0x8b
#1: (tty_files_lock){+.+.+.}, at: [<ffffffff9123e787>] selinux_bprm_committing_creds+0x55/0x22b
CPU: 1 PID: 885 Comm: sulogin Not tainted 3.18.0-next-20141216 #30
Hardware name: Dell Inc. Latitude E6530/07Y85M, BIOS A15 06/20/2014
ffff880223744f10 ffff88022410f9b8 ffffffff916ba529 0000000000000375
ffff880223744f10 ffff88022410f9e8 ffffffff91063185 0000000000000006
0000000000000000 0000000000000000 0000000000000000 ffff88022410fa38
Call Trace:
[<ffffffff916ba529>] dump_stack+0x50/0xa8
[<ffffffff91063185>] ___might_sleep+0x1b6/0x1be
[<ffffffff910632a6>] __might_sleep+0x119/0x128
[<ffffffff91140720>] cache_alloc_debugcheck_before.isra.45+0x1d/0x1f
[<ffffffff91141d81>] kmem_cache_alloc+0x43/0x1c9
[<ffffffff914e148d>] __alloc_skb+0x42/0x1a3
[<ffffffff914e2b62>] skb_copy+0x3e/0xa3
[<ffffffff910c263e>] audit_log_end+0x83/0x100
[<ffffffff9123b8d3>] ? avc_audit_pre_callback+0x103/0x103
[<ffffffff91252a73>] common_lsm_audit+0x441/0x450
[<ffffffff9123c163>] slow_avc_audit+0x63/0x67
[<ffffffff9123c42c>] avc_has_perm+0xca/0xe3
[<ffffffff9123dc2d>] inode_has_perm+0x5a/0x65
[<ffffffff9123e7ca>] selinux_bprm_committing_creds+0x98/0x22b
[<ffffffff91239e64>] security_bprm_committing_creds+0xe/0x10
[<ffffffff911515e6>] install_exec_creds+0xe/0x79
[<ffffffff911974cf>] load_elf_binary+0xe36/0x10d7
[<ffffffff9115198e>] search_binary_handler+0x81/0x18c
[<ffffffff91153376>] do_execveat_common.isra.31+0x4e3/0x7b7
[<ffffffff91153669>] do_execve+0x1f/0x21
[<ffffffff91153967>] SyS_execve+0x25/0x29
[<ffffffff916c61a9>] stub_execve+0x69/0xa0
Reported-by: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
Tested-by: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
Signed-off-by: Paul Moore <pmoore@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
kernel/audit.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -429,7 +429,7 @@ static void kauditd_send_skb(struct sk_b
* This function doesn't consume an skb as might be expected since it has to
* copy it anyways.
*/
-static void kauditd_send_multicast_skb(struct sk_buff *skb)
+static void kauditd_send_multicast_skb(struct sk_buff *skb, gfp_t gfp_mask)
{
struct sk_buff *copy;
struct audit_net *aunet = net_generic(&init_net, audit_net_id);
@@ -448,11 +448,11 @@ static void kauditd_send_multicast_skb(s
* no reason for new multicast clients to continue with this
* non-compliance.
*/
- copy = skb_copy(skb, GFP_KERNEL);
+ copy = skb_copy(skb, gfp_mask);
if (!copy)
return;
- nlmsg_multicast(sock, copy, 0, AUDIT_NLGRP_READLOG, GFP_KERNEL);
+ nlmsg_multicast(sock, copy, 0, AUDIT_NLGRP_READLOG, gfp_mask);
}
/*
@@ -1949,7 +1949,7 @@ void audit_log_end(struct audit_buffer *
struct nlmsghdr *nlh = nlmsg_hdr(ab->skb);
nlh->nlmsg_len = ab->skb->len;
- kauditd_send_multicast_skb(ab->skb);
+ kauditd_send_multicast_skb(ab->skb, ab->gfp_mask);
/*
* The original kaudit unicast socket sends up messages with
next prev parent reply other threads:[~2015-01-07 1:52 UTC|newest]
Thread overview: 90+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-07 1:49 [PATCH 3.18 00/84] 3.18.2-stable review Greg Kroah-Hartman
2015-01-07 1:49 ` [PATCH 3.18 01/84] isofs: Fix infinite looping over CE entries Greg Kroah-Hartman
2015-01-07 1:49 ` [PATCH 3.18 02/84] x86/tls: Validate TLS entries to protect espfix Greg Kroah-Hartman
2015-01-07 1:49 ` [PATCH 3.18 03/84] x86/tls: Disallow unusual TLS segments Greg Kroah-Hartman
2015-01-07 1:49 ` [PATCH 3.18 04/84] x86_64, switch_to(): Load TLS descriptors before switching DS and ES Greg Kroah-Hartman
2015-01-07 15:26 ` Jiri Slaby
2015-01-08 1:27 ` Greg Kroah-Hartman
2015-01-07 1:49 ` [PATCH 3.18 05/84] x86, kvm: Clear paravirt_enabled on KVM guests for espfix32s benefit Greg Kroah-Hartman
2015-01-07 1:49 ` [PATCH 3.18 06/84] brcmfmac: Fix bitmap malloc bug in msgbuf Greg Kroah-Hartman
2015-01-07 1:49 ` [PATCH 3.18 07/84] clocksource: arch_timer: Fix code to use physical timers when requested Greg Kroah-Hartman
2015-01-07 1:49 ` [PATCH 3.18 08/84] mfd: twl4030-power: Fix regression with missing compatible flag Greg Kroah-Hartman
2015-01-07 1:49 ` [PATCH 3.18 09/84] mfd: tc6393xb: Fail ohci suspend if full state restore is required Greg Kroah-Hartman
2015-01-07 1:49 ` [PATCH 3.18 10/84] mmc: dw_mmc: avoid write to CDTHRCTL on older versions Greg Kroah-Hartman
2015-01-07 1:49 ` [PATCH 3.18 11/84] mmc: omap_hsmmc: Fix UHS card with DDR50 support Greg Kroah-Hartman
2015-01-07 1:49 ` [PATCH 3.18 12/84] mmc: block: add newline to sysfs display of force_ro Greg Kroah-Hartman
2015-01-07 1:49 ` [PATCH 3.18 13/84] mmc: sdhci-pci-o2micro: Fix Dell E5440 issue Greg Kroah-Hartman
2015-01-07 1:49 ` [PATCH 3.18 14/84] megaraid_sas: corrected return of wait_event from abort frame path Greg Kroah-Hartman
2015-01-07 1:49 ` [PATCH 3.18 15/84] megaraid_sas: dndinaness related bug fixes Greg Kroah-Hartman
2015-01-07 1:49 ` [PATCH 3.18 16/84] regulator: anatop: Set default voltage selector for vddpu Greg Kroah-Hartman
2015-01-07 1:49 ` [PATCH 3.18 17/84] scsi: correct return values for .eh_abort_handler implementations Greg Kroah-Hartman
2015-01-07 1:49 ` [PATCH 3.18 18/84] f2fs: avoid returning uninitialized value to userspace from f2fs_trim_fs() Greg Kroah-Hartman
2015-01-07 1:49 ` [PATCH 3.18 19/84] f2fs: fix possible data corruption in f2fs_write_begin() Greg Kroah-Hartman
2015-01-07 1:49 ` [PATCH 3.18 20/84] nfs41: fix nfs4_proc_layoutget error handling Greg Kroah-Hartman
2015-01-07 1:49 ` [PATCH 3.18 21/84] dcache: fix kmemcheck warning in switch_names Greg Kroah-Hartman
2015-01-07 1:49 ` [PATCH 3.18 22/84] dm bufio: fix memleak when using a dm_buffers inline bio Greg Kroah-Hartman
2015-01-07 1:49 ` [PATCH 3.18 23/84] dm crypt: use memzero_explicit for on-stack buffer Greg Kroah-Hartman
2015-01-07 1:49 ` [PATCH 3.18 24/84] dm cache: only use overwrite optimisation for promotion when in writeback mode Greg Kroah-Hartman
2015-01-07 1:49 ` [PATCH 3.18 25/84] dm cache: dirty flag was mistakenly being cleared when promoting via overwrite Greg Kroah-Hartman
2015-01-07 1:49 ` [PATCH 3.18 26/84] dm cache: fix spurious cell_defer when dealing with partial block at end of device Greg Kroah-Hartman
2015-01-07 1:49 ` [PATCH 3.18 27/84] dm space map metadata: fix sm_bootstrap_get_nr_blocks() Greg Kroah-Hartman
2015-01-07 1:49 ` [PATCH 3.18 28/84] dm thin: fix inability to discard blocks when in out-of-data-space mode Greg Kroah-Hartman
2015-01-07 1:49 ` [PATCH 3.18 29/84] dm thin: fix missing out-of-data-space to write mode transition if blocks are released Greg Kroah-Hartman
2015-01-07 1:49 ` [PATCH 3.18 30/84] dm thin: fix a race in thin_dtr Greg Kroah-Hartman
2015-01-07 1:49 ` [PATCH 3.18 31/84] arm64: Add COMPAT_HWCAP_LPAE Greg Kroah-Hartman
2015-01-07 1:49 ` [PATCH 3.18 32/84] arm64: bpf: lift restriction on last instruction Greg Kroah-Hartman
2015-01-07 1:49 ` [PATCH 3.18 33/84] drm/tegra: gem: dumb: pitch and size are outputs Greg Kroah-Hartman
2015-01-07 1:49 ` [PATCH 3.18 34/84] ARM: tegra: Re-add removed SoC id macro to tegra_resume() Greg Kroah-Hartman
2015-01-07 1:49 ` [PATCH 3.18 35/84] ARM: mvebu: make the coherency_ll.S functions work with no coherency fabric Greg Kroah-Hartman
2015-01-07 1:49 ` [PATCH 3.18 36/84] ARM: mvebu: disable I/O coherency on non-SMP situations on Armada 370/375/38x/XP Greg Kroah-Hartman
2015-01-07 1:49 ` [PATCH 3.18 37/84] ARM: mvebu: remove conflicting muxing on Armada 370 DB Greg Kroah-Hartman
2015-01-07 1:49 ` [PATCH 3.18 39/84] x86/asm/traps: Disable tracing and kprobes in fixup_bad_iret and sync_regs Greg Kroah-Hartman
2015-01-07 1:49 ` [PATCH 3.18 40/84] x86/tls: Dont validate lm in set_thread_area() after all Greg Kroah-Hartman
2015-01-07 1:49 ` [PATCH 3.18 41/84] isofs: Fix unchecked printing of ER records Greg Kroah-Hartman
2015-01-07 1:49 ` [PATCH 3.18 42/84] x86, microcode, AMD: Do not use smp_processor_id() in preemtible context Greg Kroah-Hartman
2015-01-07 1:49 ` [PATCH 3.18 43/84] x86, microcode, intel: Drop unused parameter Greg Kroah-Hartman
2015-01-07 1:49 ` [PATCH 3.18 44/84] x86, microcode: Dont initialize microcode code on paravirt Greg Kroah-Hartman
2015-01-07 1:49 ` [PATCH 3.18 45/84] x86, microcode: Reload microcode on resume Greg Kroah-Hartman
2015-01-07 1:49 ` [PATCH 3.18 46/84] x86/microcode/intel: Fish out the stashed microcode for the BSP Greg Kroah-Hartman
2015-01-07 1:49 ` [PATCH 3.18 47/84] KEYS: Fix stale key registration at error path Greg Kroah-Hartman
2015-01-07 1:49 ` [PATCH 3.18 48/84] mac80211: copy chandef from AP vif to VLANs Greg Kroah-Hartman
2015-01-07 1:49 ` [PATCH 3.18 49/84] mac80211: avoid using uninitialized stack data Greg Kroah-Hartman
2015-01-07 1:49 ` [PATCH 3.18 51/84] mac80211: free management frame keys when removing station Greg Kroah-Hartman
2015-01-07 1:49 ` [PATCH 3.18 52/84] mnt: Fix a memory stomp in umount Greg Kroah-Hartman
2015-01-07 1:49 ` [PATCH 3.18 53/84] thermal: Fix error path in thermal_init() Greg Kroah-Hartman
2015-01-07 1:49 ` [PATCH 3.18 54/84] mnt: Implicitly add MNT_NODEV on remount when it was implicitly added by mount Greg Kroah-Hartman
2015-01-07 1:49 ` [PATCH 3.18 55/84] mnt: Update unprivileged remount test Greg Kroah-Hartman
2015-01-07 1:49 ` [PATCH 3.18 56/84] umount: Disallow unprivileged mount force Greg Kroah-Hartman
2015-01-07 1:50 ` [PATCH 3.18 57/84] groups: Consolidate the setgroups permission checks Greg Kroah-Hartman
2015-01-07 1:50 ` [PATCH 3.18 58/84] userns: Document what the invariant required for safe unprivileged mappings Greg Kroah-Hartman
2015-01-07 1:50 ` [PATCH 3.18 59/84] userns: Dont allow setgroups until a gid mapping has been setablished Greg Kroah-Hartman
2015-01-07 1:50 ` [PATCH 3.18 60/84] userns: Dont allow unprivileged creation of gid mappings Greg Kroah-Hartman
2015-01-07 1:50 ` [PATCH 3.18 61/84] userns: Check euid no fsuid when establishing an unprivileged uid mapping Greg Kroah-Hartman
2015-01-07 1:50 ` [PATCH 3.18 62/84] userns: Only allow the creator of the userns unprivileged mappings Greg Kroah-Hartman
2015-01-07 1:50 ` [PATCH 3.18 63/84] userns: Rename id_map_mutex to userns_state_mutex Greg Kroah-Hartman
2015-01-07 1:50 ` [PATCH 3.18 64/84] userns: Add a knob to disable setgroups on a per user namespace basis Greg Kroah-Hartman
2015-01-07 1:50 ` [PATCH 3.18 65/84] userns: Allow setting gid_maps without privilege when setgroups is disabled Greg Kroah-Hartman
2015-01-07 1:50 ` [PATCH 3.18 66/84] userns: Unbreak the unprivileged remount tests Greg Kroah-Hartman
2015-01-07 1:50 ` Greg Kroah-Hartman [this message]
2015-01-07 1:50 ` [PATCH 3.18 68/84] audit: dont attempt to lookup PIDs when changing PID filtering audit rules Greg Kroah-Hartman
2015-01-07 1:50 ` [PATCH 3.18 69/84] audit: restore AUDIT_LOGINUID unset ABI Greg Kroah-Hartman
2015-01-07 1:50 ` [PATCH 3.18 70/84] crypto: af_alg - fix backlog handling Greg Kroah-Hartman
2015-01-07 1:50 ` [PATCH 3.18 71/84] ncpfs: return proper error from NCP_IOC_SETROOT ioctl Greg Kroah-Hartman
2015-01-07 1:50 ` [PATCH 3.18 72/84] mm/CMA: fix boot regression due to physical address of high_memory Greg Kroah-Hartman
2015-01-07 1:50 ` [PATCH 3.18 73/84] exit: pidns: alloc_pid() leaks pid_namespace if child_reaper is exiting Greg Kroah-Hartman
2015-01-07 1:50 ` [PATCH 3.18 74/84] udf: Check path length when reading symlink Greg Kroah-Hartman
2015-01-07 1:50 ` [PATCH 3.18 75/84] udf: Verify i_size when loading inode Greg Kroah-Hartman
2015-01-07 1:50 ` [PATCH 3.18 76/84] udf: Verify symlink size before loading it Greg Kroah-Hartman
2015-01-07 1:50 ` [PATCH 3.18 77/84] udf: Check component length before reading it Greg Kroah-Hartman
2015-01-07 1:50 ` [PATCH 3.18 78/84] eCryptfs: Force RO mount when encrypted view is enabled Greg Kroah-Hartman
2015-01-07 1:50 ` [PATCH 3.18 79/84] eCryptfs: Remove buggy and unnecessary write in file name decode routine Greg Kroah-Hartman
2015-01-07 1:50 ` [PATCH 3.18 80/84] Btrfs: make sure we wait on logged extents when fsycning two subvols Greg Kroah-Hartman
2015-01-07 1:50 ` [PATCH 3.18 81/84] btrfs: fix wrong accounting of raid1 data profile in statfs Greg Kroah-Hartman
2015-01-07 1:50 ` [PATCH 3.18 82/84] Btrfs: do not move em to modified list when unpinning Greg Kroah-Hartman
2015-01-07 1:50 ` [PATCH 3.18 83/84] Btrfs: make sure logged extents complete in the current transaction V3 Greg Kroah-Hartman
2015-01-07 1:50 ` [PATCH 3.18 84/84] Btrfs: fix fs corruption on transaction abort if device supports discard Greg Kroah-Hartman
2015-01-07 13:47 ` [PATCH 3.18 00/84] 3.18.2-stable review Guenter Roeck
2015-01-07 23:33 ` Shuah Khan
2015-01-07 23:45 ` Greg Kroah-Hartman
2015-01-08 10:20 ` Satoru Takeuchi
2015-01-08 16:33 ` Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150107014031.158563308@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=Valdis.Kletnieks@vt.edu \
--cc=linux-kernel@vger.kernel.org \
--cc=pmoore@redhat.com \
--cc=rgb@redhat.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).