From: Kamal Mostafa <kamal@canonical.com>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org,
kernel-team@lists.ubuntu.com
Cc: Jann Horn <jann@thejh.net>,
Linus Torvalds <torvalds@linux-foundation.org>,
Luis Henriques <luis.henriques@canonical.com>,
Kamal Mostafa <kamal@canonical.com>
Subject: [PATCH 3.13.y-ckt 20/90] fs: take i_mutex during prepare_binprm for set[ug]id executables
Date: Tue, 5 May 2015 13:53:52 -0700 [thread overview]
Message-ID: <1430859302-5886-21-git-send-email-kamal@canonical.com> (raw)
In-Reply-To: <1430859302-5886-1-git-send-email-kamal@canonical.com>
3.13.11-ckt20 -stable review patch. If anyone has any objections, please let me know.
------------------
From: Jann Horn <jann@thejh.net>
commit 8b01fc86b9f425899f8a3a8fc1c47d73c2c20543 upstream.
This prevents a race between chown() and execve(), where chowning a
setuid-user binary to root would momentarily make the binary setuid
root.
This patch was mostly written by Linus Torvalds.
Signed-off-by: Jann Horn <jann@thejh.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
[ luis: backported to 3.16:
- relaced task_no_new_privs() by current->no_new_privs
- replaced READ_ONCE() by ACCESS_ONCE() ]
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
---
fs/exec.c | 76 ++++++++++++++++++++++++++++++++++++++++-----------------------
1 file changed, 48 insertions(+), 28 deletions(-)
diff --git a/fs/exec.c b/fs/exec.c
index 5743b8f..f1a8244 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -1267,6 +1267,53 @@ static int check_unsafe_exec(struct linux_binprm *bprm)
return res;
}
+static void bprm_fill_uid(struct linux_binprm *bprm)
+{
+ struct inode *inode;
+ unsigned int mode;
+ kuid_t uid;
+ kgid_t gid;
+
+ /* clear any previous set[ug]id data from a previous binary */
+ bprm->cred->euid = current_euid();
+ bprm->cred->egid = current_egid();
+
+ if (bprm->file->f_path.mnt->mnt_flags & MNT_NOSUID)
+ return;
+
+ if (current->no_new_privs)
+ return;
+
+ inode = file_inode(bprm->file);
+ mode = ACCESS_ONCE(inode->i_mode);
+ if (!(mode & (S_ISUID|S_ISGID)))
+ return;
+
+ /* Be careful if suid/sgid is set */
+ mutex_lock(&inode->i_mutex);
+
+ /* reload atomically mode/uid/gid now that lock held */
+ mode = inode->i_mode;
+ uid = inode->i_uid;
+ gid = inode->i_gid;
+ mutex_unlock(&inode->i_mutex);
+
+ /* We ignore suid/sgid if there are no mappings for them in the ns */
+ if (!kuid_has_mapping(bprm->cred->user_ns, uid) ||
+ !kgid_has_mapping(bprm->cred->user_ns, gid))
+ return;
+
+ if (mode & S_ISUID) {
+ bprm->per_clear |= PER_CLEAR_ON_SETID;
+ bprm->cred->euid = uid;
+ }
+
+ if ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP)) {
+ bprm->per_clear |= PER_CLEAR_ON_SETID;
+ bprm->cred->egid = gid;
+ }
+}
+
/*
* Fill the binprm structure from the inode.
* Check permissions, then read the first 128 (BINPRM_BUF_SIZE) bytes
@@ -1275,36 +1322,9 @@ static int check_unsafe_exec(struct linux_binprm *bprm)
*/
int prepare_binprm(struct linux_binprm *bprm)
{
- struct inode *inode = file_inode(bprm->file);
- umode_t mode = inode->i_mode;
int retval;
-
- /* clear any previous set[ug]id data from a previous binary */
- bprm->cred->euid = current_euid();
- bprm->cred->egid = current_egid();
-
- if (!(bprm->file->f_path.mnt->mnt_flags & MNT_NOSUID) &&
- !current->no_new_privs &&
- kuid_has_mapping(bprm->cred->user_ns, inode->i_uid) &&
- kgid_has_mapping(bprm->cred->user_ns, inode->i_gid)) {
- /* Set-uid? */
- if (mode & S_ISUID) {
- bprm->per_clear |= PER_CLEAR_ON_SETID;
- bprm->cred->euid = inode->i_uid;
- }
-
- /* Set-gid? */
- /*
- * If setgid is set but no group execute bit then this
- * is a candidate for mandatory locking, not a setgid
- * executable.
- */
- if ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP)) {
- bprm->per_clear |= PER_CLEAR_ON_SETID;
- bprm->cred->egid = inode->i_gid;
- }
- }
+ bprm_fill_uid(bprm);
/* fill in binprm security blob */
retval = security_bprm_set_creds(bprm);
--
1.9.1
next prev parent reply other threads:[~2015-05-05 21:19 UTC|newest]
Thread overview: 91+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-05 20:53 [3.13.y-ckt stable] Linux 3.13.11-ckt20 stable review Kamal Mostafa
2015-05-05 20:53 ` [PATCH 3.13.y-ckt 01/90] Input: serio - add firmware_id sysfs attribute Kamal Mostafa
2015-05-05 20:53 ` [PATCH 3.13.y-ckt 02/90] Input: i8042 - add firmware_id support Kamal Mostafa
2015-05-05 20:53 ` [PATCH 3.13.y-ckt 03/90] Input: Add INPUT_PROP_TOPBUTTONPAD device property Kamal Mostafa
2015-05-05 20:53 ` [PATCH 3.13.y-ckt 04/90] Input: synaptics - report INPUT_PROP_TOPBUTTONPAD property Kamal Mostafa
2015-05-05 20:53 ` [PATCH 3.13.y-ckt 05/90] Input: synaptics - add a matches_pnp_id helper function Kamal Mostafa
2015-05-05 20:53 ` [PATCH 3.13.y-ckt 06/90] Input: synaptics - change min/max quirk table to pnp-id matching Kamal Mostafa
2015-05-05 20:53 ` [PATCH 3.13.y-ckt 07/90] Input: psmouse - add psmouse_matches_pnp_id helper function Kamal Mostafa
2015-05-05 20:53 ` [PATCH 3.13.y-ckt 08/90] Input: synaptics - split synaptics_resolution(), query first Kamal Mostafa
2015-05-05 20:53 ` [PATCH 3.13.y-ckt 09/90] Input: synaptics - log queried and quirked dimension values Kamal Mostafa
2015-05-05 20:53 ` [PATCH 3.13.y-ckt 10/90] Input: synaptics - remove obsolete min/max quirk for X240 Kamal Mostafa
2015-05-05 20:53 ` [PATCH 3.13.y-ckt 11/90] Input: synaptics - add min/max quirk for pnp-id LEN2002 (Edge E531) Kamal Mostafa
2015-05-05 20:53 ` [PATCH 3.13.y-ckt 12/90] Input: synaptics - add min/max quirk for Lenovo T440s Kamal Mostafa
2015-05-05 20:53 ` [PATCH 3.13.y-ckt 13/90] Input: synaptics - adjust min/max for Lenovo ThinkPad X1 Carbon 2nd Kamal Mostafa
2015-05-05 20:53 ` [PATCH 3.13.y-ckt 14/90] Input: synaptics - adjust min/max on Thinkpad E540 Kamal Mostafa
2015-05-05 20:53 ` [PATCH 3.13.y-ckt 15/90] Input: synaptics - support min/max board id in min_max_pnpid_table Kamal Mostafa
2015-05-05 20:53 ` [PATCH 3.13.y-ckt 16/90] Input: synaptics - skip quirks when post-2013 dimensions Kamal Mostafa
2015-05-05 20:53 ` [PATCH 3.13.y-ckt 17/90] n_tty: Merge .receive_buf() flavors Kamal Mostafa
2015-05-05 20:53 ` [PATCH 3.13.y-ckt 18/90] n_tty: Fix read buffer overwrite when no newline Kamal Mostafa
2015-05-05 20:53 ` [PATCH 3.13.y-ckt 19/90] KVM: x86: Fix lost interrupt on irr_pending race Kamal Mostafa
2015-05-05 20:53 ` Kamal Mostafa [this message]
2015-05-05 20:53 ` [PATCH 3.13.y-ckt 21/90] tcp: Fix crash in TCP Fast Open Kamal Mostafa
2015-05-05 20:53 ` [PATCH 3.13.y-ckt 22/90] writeback: add missing INITIAL_JIFFIES init in global_update_bandwidth() Kamal Mostafa
2015-05-05 20:53 ` [PATCH 3.13.y-ckt 23/90] nbd: fix possible memory leak Kamal Mostafa
2015-05-05 20:53 ` [PATCH 3.13.y-ckt 24/90] mfd: kempld-core: Fix callback return value check Kamal Mostafa
2015-05-05 20:53 ` [PATCH 3.13.y-ckt 25/90] KVM: nVMX: mask unrestricted_guest if disabled on L0 Kamal Mostafa
2015-05-05 20:53 ` [PATCH 3.13.y-ckt 26/90] spi: trigger trace event for message-done before mesg->complete Kamal Mostafa
2015-05-05 20:53 ` [PATCH 3.13.y-ckt 27/90] powerpc/pseries: Little endian fixes for post mobility device tree update Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 28/90] net: ethernet: pcnet32: Setup the SRAM and NOUFLO on Am79C97{3, 5} Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 29/90] perf: Fix irq_work 'tail' recursion Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 30/90] arm64: Use the reserved TTBR0 if context switching to the init_mm Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 31/90] selinux: fix sel_write_enforce broken return value Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 32/90] mm: fix anon_vma->degree underflow in anon_vma endless growing prevention Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 33/90] mm/memory hotplug: postpone the reset of obsolete pgdat Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 34/90] hfsplus: fix B-tree corruption after insertion at position 0 Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 35/90] ARC: SA_SIGINFO ucontext regs off-by-one Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 36/90] writeback: fix possible underflow in write bandwidth calculation Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 37/90] iio: fix drivers that check buffer->scan_mask Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 38/90] iio: inv_mpu6050: Clear timestamps fifo while resetting hardware fifo Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 39/90] iio: core: Fix double free Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 40/90] USB: ftdi_sio: Added custom PID for Synapse Wireless product Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 41/90] iwlwifi: dvm: run INIT firmware again upon .start() Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 42/90] USB: keyspan_pda: add new device id Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 43/90] cifs: smb2_clone_range() - exit on unhandled error Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 44/90] cifs: fix use-after-free bug in find_writable_file Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 45/90] can: flexcan: Deferred on Regulator return EPROBE_DEFER Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 46/90] usb: xhci: handle Config Error Change (CEC) in xhci driver Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 47/90] usb: xhci: apply XHCI_AVOID_BEI quirk to all Intel xHCI controllers Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 48/90] USB: ftdi_sio: Use jtag quirk for SNAP Connect E10 Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 49/90] tty: serial: fsl_lpuart: clear receive flag on FIFO flush Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 50/90] radeon: Do not directly dereference pointers to BIOS area Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 51/90] iio: imu: Use iio_trigger_get for indio_dev->trig assignment Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 52/90] dmaengine: edma: fix memory leak when terminating running transfers Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 53/90] dmaengine: omap-dma: Fix memory leak when terminating running transfer Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 54/90] x86/reboot: Add ASRock Q1900DC-ITX mainboard reboot quirk Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 55/90] mac80211: fix RX A-MPDU session reorder timer deletion Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 56/90] IB/uverbs: Prevent integer overflow in ib_umem_get address arithmetic Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 57/90] tcp: prevent fetching dst twice in early demux code Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 58/90] net: use for_each_netdev_safe() in rtnl_group_changelink() Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 59/90] xen-netfront: transmit fully GSO-sized packets Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 60/90] tcp: fix FRTO undo on cumulative ACK of SACKed range Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 61/90] PCI: cpcihp: Add missing curly braces in cpci_configure_slot() Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 62/90] [media] sh_veu: v4l2_dev wasn't set Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 63/90] [media] media: s5p-mfc: fix mmap support for 64bit arch Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 64/90] cpuidle: ACPI: do not overwrite name and description of C0 Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 65/90] ioctx_alloc(): fix vma (and file) leak on failure Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 66/90] ALSA: hda/realtek - Make more stable to get pin sense for ALC283 Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 67/90] be2iscsi: Fix kernel panic when device initialization fails Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 68/90] Defer processing of REQ_PREEMPT requests for blocked devices Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 69/90] ALSA: hda - Fix headphone pin config for Lifebook T731 Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 70/90] ocfs2: _really_ sync the right range Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 71/90] ALSA: usb - Creative USB X-Fi Pro SB1095 volume knob support Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 72/90] iscsi target: fix oops when adding reject pdu Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 73/90] net/mlx4_en: Call register_netdevice in the proper location Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 74/90] ipv6: protect skb->sk accesses from recursive dereference inside the stack Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 75/90] tcp: tcp_make_synack() should clear skb->tstamp Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 76/90] 8139cp: Call dev_kfree_skby_any instead of kfree_skb Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 77/90] 8139too: Call dev_kfree_skby_any instead of dev_kfree_skb Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 78/90] r8169: " Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 79/90] bonding: Call dev_kfree_skby_any instead of kfree_skb Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 80/90] bnx2: Call dev_kfree_skby_any instead of dev_kfree_skb Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 81/90] tg3: " Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 82/90] ixgb: " Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 83/90] benet: Call dev_kfree_skby_any instead of kfree_skb Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 84/90] gianfar: Carefully free skbs in functions called by netpoll Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 85/90] ip_forward: Drop frames with attached skb->sk Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 86/90] tcp: fix possible deadlock in tcp_send_fin() Kamal Mostafa
2015-05-05 20:54 ` [PATCH 3.13.y-ckt 87/90] tcp: avoid looping " Kamal Mostafa
2015-05-05 20:55 ` [PATCH 3.13.y-ckt 88/90] net: do not deplete pfmemalloc reserve Kamal Mostafa
2015-05-05 20:55 ` [PATCH 3.13.y-ckt 89/90] net: fix crash in build_skb() Kamal Mostafa
2015-05-05 20:55 ` [PATCH 3.13.y-ckt 90/90] ipv4: Missing sk_nulls_node_init() in ping_unhash() Kamal Mostafa
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=1430859302-5886-21-git-send-email-kamal@canonical.com \
--to=kamal@canonical.com \
--cc=jann@thejh.net \
--cc=kernel-team@lists.ubuntu.com \
--cc=linux-kernel@vger.kernel.org \
--cc=luis.henriques@canonical.com \
--cc=stable@vger.kernel.org \
--cc=torvalds@linux-foundation.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
all inboxes | Powered by JetHome®