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.17 56/73] audit: use supplied gfp_mask from audit_buffer in kauditd_send_multicast_skb
Date: Tue, 6 Jan 2015 18:16:17 -0800 [thread overview]
Message-ID: <20150107021559.236733972@linuxfoundation.org> (raw)
In-Reply-To: <20150107021557.521276020@linuxfoundation.org>
3.17-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);
}
/*
@@ -1959,7 +1959,7 @@ void audit_log_end(struct audit_buffer *
} else {
struct nlmsghdr *nlh = nlmsg_hdr(ab->skb);
- 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 2:16 UTC|newest]
Thread overview: 75+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-07 2:15 [PATCH 3.17 00/73] 3.17.8-stable review Greg Kroah-Hartman
2015-01-07 2:15 ` [PATCH 3.17 01/73] isofs: Fix infinite looping over CE entries Greg Kroah-Hartman
2015-01-07 2:15 ` [PATCH 3.17 02/73] x86/tls: Validate TLS entries to protect espfix Greg Kroah-Hartman
2015-01-07 2:15 ` [PATCH 3.17 03/73] x86/tls: Disallow unusual TLS segments Greg Kroah-Hartman
2015-01-07 2:15 ` [PATCH 3.17 04/73] x86_64, switch_to(): Load TLS descriptors before switching DS and ES Greg Kroah-Hartman
2015-01-07 2:15 ` [PATCH 3.17 05/73] x86, kvm: Clear paravirt_enabled on KVM guests for espfix32s benefit Greg Kroah-Hartman
2015-01-07 2:15 ` [PATCH 3.17 06/73] md/bitmap: always wait for writes on unplug Greg Kroah-Hartman
2015-01-07 2:15 ` [PATCH 3.17 07/73] mfd: twl4030-power: Fix regression with missing compatible flag Greg Kroah-Hartman
2015-01-07 2:15 ` [PATCH 3.17 08/73] mfd: tc6393xb: Fail ohci suspend if full state restore is required Greg Kroah-Hartman
2015-01-07 2:15 ` [PATCH 3.17 09/73] mmc: dw_mmc: avoid write to CDTHRCTL on older versions Greg Kroah-Hartman
2015-01-07 2:15 ` [PATCH 3.17 10/73] mmc: omap_hsmmc: Fix UHS card with DDR50 support Greg Kroah-Hartman
2015-01-07 2:15 ` [PATCH 3.17 11/73] mmc: block: add newline to sysfs display of force_ro Greg Kroah-Hartman
2015-01-07 2:15 ` [PATCH 3.17 12/73] mmc: sdhci-pci-o2micro: Fix Dell E5440 issue Greg Kroah-Hartman
2015-01-07 2:15 ` [PATCH 3.17 13/73] megaraid_sas: corrected return of wait_event from abort frame path Greg Kroah-Hartman
2015-01-07 2:15 ` [PATCH 3.17 14/73] regulator: anatop: Set default voltage selector for vddpu Greg Kroah-Hartman
2015-01-07 2:15 ` [PATCH 3.17 15/73] scsi: correct return values for .eh_abort_handler implementations Greg Kroah-Hartman
2015-01-07 2:15 ` [PATCH 3.17 16/73] f2fs: fix possible data corruption in f2fs_write_begin() Greg Kroah-Hartman
2015-01-07 2:15 ` [PATCH 3.17 17/73] nfs41: fix nfs4_proc_layoutget error handling Greg Kroah-Hartman
2015-01-07 2:15 ` [PATCH 3.17 18/73] dcache: fix kmemcheck warning in switch_names Greg Kroah-Hartman
2015-01-07 2:15 ` [PATCH 3.17 19/73] dm bufio: fix memleak when using a dm_buffers inline bio Greg Kroah-Hartman
2015-01-07 2:15 ` [PATCH 3.17 20/73] dm crypt: use memzero_explicit for on-stack buffer Greg Kroah-Hartman
2015-01-07 2:15 ` [PATCH 3.17 21/73] dm cache: only use overwrite optimisation for promotion when in writeback mode Greg Kroah-Hartman
2015-01-07 2:15 ` [PATCH 3.17 22/73] dm cache: dirty flag was mistakenly being cleared when promoting via overwrite Greg Kroah-Hartman
2015-01-07 2:15 ` [PATCH 3.17 23/73] dm cache: fix spurious cell_defer when dealing with partial block at end of device Greg Kroah-Hartman
2015-01-07 2:15 ` [PATCH 3.17 24/73] dm space map metadata: fix sm_bootstrap_get_nr_blocks() Greg Kroah-Hartman
2015-01-07 2:15 ` [PATCH 3.17 25/73] dm thin: fix inability to discard blocks when in out-of-data-space mode Greg Kroah-Hartman
2015-01-07 2:15 ` [PATCH 3.17 26/73] dm thin: fix missing out-of-data-space to write mode transition if blocks are released Greg Kroah-Hartman
2015-01-07 2:15 ` [PATCH 3.17 27/73] dm thin: fix a race in thin_dtr Greg Kroah-Hartman
2015-01-07 2:15 ` [PATCH 3.17 28/73] brcmfmac: Fix bitmap malloc bug in msgbuf Greg Kroah-Hartman
2015-01-07 2:15 ` [PATCH 3.17 29/73] arm64: Add COMPAT_HWCAP_LPAE Greg Kroah-Hartman
2015-01-07 2:15 ` [PATCH 3.17 30/73] drm/tegra: gem: dumb: pitch and size are outputs Greg Kroah-Hartman
2015-01-07 2:15 ` [PATCH 3.17 31/73] ARM: tegra: Re-add removed SoC id macro to tegra_resume() Greg Kroah-Hartman
2015-01-07 2:15 ` [PATCH 3.17 32/73] ARM: mvebu: make the coherency_ll.S functions work with no coherency fabric Greg Kroah-Hartman
2015-01-07 2:15 ` [PATCH 3.17 33/73] ARM: mvebu: disable I/O coherency on non-SMP situations on Armada 370/375/38x/XP Greg Kroah-Hartman
2015-01-07 2:15 ` [PATCH 3.17 35/73] x86/asm/traps: Disable tracing and kprobes in fixup_bad_iret and sync_regs Greg Kroah-Hartman
2015-01-07 2:15 ` [PATCH 3.17 36/73] x86/tls: Dont validate lm in set_thread_area() after all Greg Kroah-Hartman
2015-01-07 2:15 ` [PATCH 3.17 37/73] isofs: Fix unchecked printing of ER records Greg Kroah-Hartman
2015-01-07 2:15 ` [PATCH 3.17 38/73] KEYS: Fix stale key registration at error path Greg Kroah-Hartman
2015-01-07 2:16 ` [PATCH 3.17 40/73] mac80211: free management frame keys when removing station Greg Kroah-Hartman
2015-01-07 2:16 ` [PATCH 3.17 41/73] mnt: Fix a memory stomp in umount Greg Kroah-Hartman
2015-01-07 2:16 ` [PATCH 3.17 42/73] thermal: Fix error path in thermal_init() Greg Kroah-Hartman
2015-01-07 2:16 ` [PATCH 3.17 43/73] mnt: Implicitly add MNT_NODEV on remount when it was implicitly added by mount Greg Kroah-Hartman
2015-01-07 2:16 ` [PATCH 3.17 44/73] mnt: Update unprivileged remount test Greg Kroah-Hartman
2015-01-07 2:16 ` [PATCH 3.17 45/73] umount: Disallow unprivileged mount force Greg Kroah-Hartman
2015-01-07 2:16 ` [PATCH 3.17 46/73] groups: Consolidate the setgroups permission checks Greg Kroah-Hartman
2015-01-07 2:16 ` [PATCH 3.17 47/73] userns: Document what the invariant required for safe unprivileged mappings Greg Kroah-Hartman
2015-01-07 2:16 ` [PATCH 3.17 48/73] userns: Dont allow setgroups until a gid mapping has been setablished Greg Kroah-Hartman
2015-01-07 2:16 ` [PATCH 3.17 49/73] userns: Dont allow unprivileged creation of gid mappings Greg Kroah-Hartman
2015-01-07 2:16 ` [PATCH 3.17 50/73] userns: Check euid no fsuid when establishing an unprivileged uid mapping Greg Kroah-Hartman
2015-01-07 2:16 ` [PATCH 3.17 51/73] userns: Only allow the creator of the userns unprivileged mappings Greg Kroah-Hartman
2015-01-07 2:16 ` [PATCH 3.17 52/73] userns: Rename id_map_mutex to userns_state_mutex Greg Kroah-Hartman
2015-01-07 2:16 ` [PATCH 3.17 53/73] userns: Add a knob to disable setgroups on a per user namespace basis Greg Kroah-Hartman
2015-01-07 2:16 ` [PATCH 3.17 54/73] userns: Allow setting gid_maps without privilege when setgroups is disabled Greg Kroah-Hartman
2015-01-07 2:16 ` [PATCH 3.17 55/73] userns: Unbreak the unprivileged remount tests Greg Kroah-Hartman
2015-01-07 2:16 ` Greg Kroah-Hartman [this message]
2015-01-07 2:16 ` [PATCH 3.17 57/73] audit: dont attempt to lookup PIDs when changing PID filtering audit rules Greg Kroah-Hartman
2015-01-07 2:16 ` [PATCH 3.17 58/73] audit: restore AUDIT_LOGINUID unset ABI Greg Kroah-Hartman
2015-01-07 2:16 ` [PATCH 3.17 59/73] crypto: af_alg - fix backlog handling Greg Kroah-Hartman
2015-01-07 2:16 ` [PATCH 3.17 60/73] ncpfs: return proper error from NCP_IOC_SETROOT ioctl Greg Kroah-Hartman
2015-01-07 2:16 ` [PATCH 3.17 61/73] exit: pidns: alloc_pid() leaks pid_namespace if child_reaper is exiting Greg Kroah-Hartman
2015-01-07 2:16 ` [PATCH 3.17 62/73] udf: Check path length when reading symlink Greg Kroah-Hartman
2015-01-07 2:16 ` [PATCH 3.17 63/73] udf: Verify i_size when loading inode Greg Kroah-Hartman
2015-01-07 2:16 ` [PATCH 3.17 64/73] udf: Verify symlink size before loading it Greg Kroah-Hartman
2015-01-07 2:16 ` [PATCH 3.17 65/73] udf: Check component length before reading it Greg Kroah-Hartman
2015-01-07 2:16 ` [PATCH 3.17 66/73] eCryptfs: Force RO mount when encrypted view is enabled Greg Kroah-Hartman
2015-01-07 2:16 ` [PATCH 3.17 67/73] eCryptfs: Remove buggy and unnecessary write in file name decode routine Greg Kroah-Hartman
2015-01-07 2:16 ` [PATCH 3.17 68/73] Btrfs: make sure we wait on logged extents when fsycning two subvols Greg Kroah-Hartman
2015-01-07 2:16 ` [PATCH 3.17 69/73] btrfs: fix wrong accounting of raid1 data profile in statfs Greg Kroah-Hartman
2015-01-07 2:16 ` [PATCH 3.17 70/73] Btrfs: do not move em to modified list when unpinning Greg Kroah-Hartman
2015-01-07 2:16 ` [PATCH 3.17 71/73] Btrfs: make sure logged extents complete in the current transaction V3 Greg Kroah-Hartman
2015-01-07 2:16 ` [PATCH 3.17 72/73] Btrfs: fix loop writing of async reclaim Greg Kroah-Hartman
2015-01-07 2:16 ` [PATCH 3.17 73/73] Btrfs: fix fs corruption on transaction abort if device supports discard Greg Kroah-Hartman
2015-01-07 13:46 ` [PATCH 3.17 00/73] 3.17.8-stable review Guenter Roeck
2015-01-07 23:46 ` Greg Kroah-Hartman
2015-01-07 23:34 ` Shuah Khan
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=20150107021559.236733972@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).