Linux 3.14.28
Greg KH
maintainerI'm announcing the release of the 3.14.28 kernel.
All users of the 3.14 kernel series must upgrade.
The updated 3.14.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.14.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 arch/arm/boot/dts/armada-370.dtsi | 10 arch/arm/mach-tegra/reset-handler.S | 1 arch/arm64/include/asm/hwcap.h | 1 arch/arm64/kernel/setup.c | 3 arch/s390/kernel/compat_linux.c | 2 arch/x86/include/uapi/asm/ldt.h | 7 arch/x86/kernel/kvm.c | 9 arch/x86/kernel/kvmclock.c | 1 arch/x86/kernel/process_64.c | 101 +++++- arch/x86/kernel/tls.c | 39 ++ crypto/af_alg.c | 3 drivers/md/bitmap.c | 16 - drivers/md/dm-bufio.c | 20 + drivers/md/dm-cache-target.c | 13 drivers/md/dm-crypt.c | 2 drivers/md/dm-thin.c | 24 + drivers/md/persistent-data/dm-space-map-metadata.c | 4 drivers/mfd/tc6393xb.c | 13 drivers/mmc/card/block.c | 2 drivers/mmc/host/dw_mmc.c | 7 drivers/mmc/host/sdhci-pci-o2micro.c | 2 drivers/scsi/NCR5380.c | 12 drivers/scsi/aha1740.c | 2 drivers/scsi/atari_NCR5380.c | 2 drivers/scsi/esas2r/esas2r_main.c | 2 drivers/scsi/megaraid.c | 8 drivers/scsi/megaraid/megaraid_sas_base.c | 2 drivers/scsi/sun3_NCR5380.c | 10 drivers/thermal/thermal_core.c | 4 fs/btrfs/disk-io.c | 6 fs/btrfs/extent-tree.c | 10 fs/btrfs/extent_map.c | 2 fs/ecryptfs/crypto.c | 1 fs/ecryptfs/file.c | 12 fs/ecryptfs/main.c | 16 - fs/isofs/rock.c | 9 fs/namespace.c | 13 fs/ncpfs/ioctl.c | 1 fs/nfs/nfs4proc.c | 6 fs/proc/base.c | 53 +++ fs/udf/symlink.c | 17 - include/linux/audit.h | 4 include/linux/cred.h | 1 include/linux/user_namespace.h | 12 kernel/auditfilter.c | 10 kernel/groups.c | 11 kernel/pid.c | 2 kernel/uid16.c | 2 kernel/user.c | 1 kernel/user_namespace.c | 125 +++++++- net/mac80211/key.c | 2 net/mac80211/rx.c | 11 security/keys/encrypted-keys/encrypted.c | 5 tools/testing/selftests/mount/unprivileged-remount-test.c | 204 +++++++++++--- 55 files changed, 681 insertions(+), 179 deletions(-)
Andreas Müller (1):
mac80211: fix multicast LED blinking and counter
Andy Lutomirski (5):
x86/tls: Validate TLS entries to protect espfix
x86/tls: Disallow unusual TLS segments
x86_64, switch_to(): Load TLS descriptors before switching DS and ES x86, kvm: Clear paravirt_enabled on KVM guests for espfix32's benefit x86/tls: Don't validate lm in set_thread_area() after all
Baruch Siach (1):
mmc: block: add newline to sysfs display of force_ro
Catalin Marinas (1):
arm64: Add COMPAT_HWCAP_LPAE
Dan Carpenter (1):
dm space map metadata: fix sm_bootstrap_get_nr_blocks()
Darrick J. Wong (1):
dm bufio: fix memleak when using a dm_buffer's inline bio
Dmitry Eremin-Solenikov (1):
mfd: tc6393xb: Fail ohci suspend if full state restore is required
Dmitry Osipenko (1):
ARM: tegra: Re-add removed SoC id macro to tegra_resume()
Eric W. Biederman (14):
mnt: Fix a memory stomp in umount
mnt: Implicitly add MNT_NODEV on remount when it was implicitly added by mount
mnt: Update unprivileged remount test
umount: Disallow unprivileged mount force
groups: Consolidate the setgroups permission checks
userns: Document what the invariant required for safe unprivileged mappings.
userns: Don't allow setgroups until a gid mapping has been setablished
userns: Don't allow unprivileged creation of gid mappings
userns: Check euid no fsuid when establishing an unprivileged uid mapping
userns: Only allow the creator of the userns unprivileged mappings
userns: Rename id_map_mutex to userns_state_mutex
userns: Add a knob to disable setgroups on a per user namespace basis
userns: Allow setting gid_maps without privilege when setgroups is disabled
userns: Unbreak the unprivileged remount tests
Filipe Manana (1):
Btrfs: fix fs corruption on transaction abort if device supports discard
Greg Kroah-Hartman (1):
Linux 3.14.28
Hannes Reinecke (1):
scsi: correct return values for .eh_abort_handler implementations
James Hogan (1):
mmc: dw_mmc: avoid write to CDTHRCTL on older versions
Jan Kara (4):
isofs: Fix infinite looping over CE entries
isofs: Fix unchecked printing of ER records
ncpfs: return proper error from NCP_IOC_SETROOT ioctl
udf: Verify symlink size before loading it
Joe Thornber (4):
dm cache: only use overwrite optimisation for promotion when in writeback mode dm cache: dirty flag was mistakenly being cleared when promoting via overwrite dm thin: fix inability to discard blocks when in out-of-data-space mode dm thin: fix missing out-of-data-space to write mode transition if blocks are released
Johannes Berg (1):
mac80211: free management frame keys when removing station
Josef Bacik (1):
Btrfs: do not move em to modified list when unpinning
Luis Henriques (1):
thermal: Fix error path in thermal_init()
Michael Halcrow (1):
eCryptfs: Remove buggy and unnecessary write in file name decode routine
Milan Broz (1):
dm crypt: use memzero_explicit for on-stack buffer
NeilBrown (1):
md/bitmap: always wait for writes on unplug.
Oleg Nesterov (1):
exit: pidns: alloc_pid() leaks pid_namespace if child_reaper is exiting
Peng Tao (1):
nfs41: fix nfs4_proc_layoutget error handling
Peter Guo (1):
mmc: sdhci-pci-o2micro: Fix Dell E5440 issue
Rabin Vincent (1):
crypto: af_alg - fix backlog handling
Richard Guy Briggs (1):
audit: restore AUDIT_LOGINUID unset ABI
[email protected] (1):
megaraid_sas: corrected return of wait_event from abort frame path
Takashi Iwai (1):
KEYS: Fix stale key registration at error path
Tyler Hicks (1):
eCryptfs: Force RO mount when encrypted view is enabled
Uwe Kleine-König (1):
ARM: mvebu: fix ordering in Armada 370 .dtsi
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 14 -SUBLEVEL = 27 +SUBLEVEL = 28 EXTRAVERSION = NAME = Remembering Coco
arch/arm/boot/dts/armada-370.dtsi +5 -5
@@ -106,11 +106,6 @@ reg = <0x11100 0x20>; }; - system-controller@18200 { - compatible = "marvell,armada-370-xp-system-controller"; - reg = <0x18200 0x100>; - }; - pinctrl { compatible = "marvell,mv88f6710-pinctrl"; reg = <0x18000 0x38>;
@@ -167,6 +162,11 @@ interrupts = <91>; }; + system-controller@18200 { + compatible = "marvell,armada-370-xp-system-controller"; + reg = <0x18200 0x100>; + }; + gateclk: clock-gating-control@18220 { compatible = "marvell,armada-370-gating-clock"; reg = <0x18220 0x4>;
arch/arm/mach-tegra/reset-handler.S +1 -0
@@ -51,6 +51,7 @@ ENTRY(tegra_resume) THUMB( it ne ) bne cpu_resume @ no + tegra_get_soc_id TEGRA_APB_MISC_BASE, r6 /* Are we on Tegra20? */ cmp r6, #TEGRA20 beq 1f @ Yes
arch/arm64/include/asm/hwcap.h +1 -0
@@ -30,6 +30,7 @@#define COMPAT_HWCAP_IDIVA (1 << 17)#define COMPAT_HWCAP_IDIVT (1 << 18)#define COMPAT_HWCAP_IDIV (COMPAT_HWCAP_IDIVA|COMPAT_HWCAP_IDIVT) +#define COMPAT_HWCAP_LPAE (1 << 20)#define COMPAT_HWCAP_EVTSTRM (1 << 21)#ifndef __ASSEMBLY__
arch/arm64/kernel/setup.c +2 -1
@@ -67,7 +67,8 @@ EXPORT_SYMBOL_GPL(elf_hwcap); COMPAT_HWCAP_FAST_MULT|COMPAT_HWCAP_EDSP|\ COMPAT_HWCAP_TLS|COMPAT_HWCAP_VFP|\ COMPAT_HWCAP_VFPv3|COMPAT_HWCAP_VFPv4|\ - COMPAT_HWCAP_NEON|COMPAT_HWCAP_IDIV) + COMPAT_HWCAP_NEON|COMPAT_HWCAP_IDIV|\ + COMPAT_HWCAP_LPAE)unsigned int compat_elf_hwcap__read_mostly =COMPAT_ELF_HWCAP_DEFAULT ;#endif
arch/s390/kernel/compat_linux.c +1 -1
@@ -245,7 +245,7 @@ asmlinkage long sys32_setgroups16(int gidsetsize, u16 __user *grouplist)struct group_info *group_info;int retval; -if (!capable (CAP_SETGID )) +if (!may_setgroups ())return -EPERM ;if ((unsigned )gidsetsize >NGROUPS_MAX )return -EINVAL ;
arch/x86/include/uapi/asm/ldt.h +7 -0
@@ -28,6 +28,13 @@ struct user_desc { unsigned int seg_not_present:1; unsigned int useable:1;#ifdef __x86_64__ +/* +* Because this bit is not present in 32-bit user code, user +* programs can pass uninitialized values here. Therefore, in +* any context in which a user_desc comes from a 32-bit program, +* the kernel must act as though lm == 0, regardless of the +* actual value. +*/ unsigned int lm:1;#endif };
arch/x86/kernel/kvm.c +8 -1
@@ -280,7 +280,14 @@ do_async_page_fault(struct pt_regs *regs, unsigned long error_code)static void __init paravirt_ops_setup (void ) { pv_info.name ="KVM" ; - pv_info.paravirt_enabled =1 ; + +/* +* KVM isn't paravirt in the sense of paravirt_enabled. A KVM +* guest kernel works like a bare metal kernel with additional +* features, and paravirt_enabled is about features that are +* missing. +*/ + pv_info.paravirt_enabled =0 ;if (kvm_para_has_feature (KVM_FEATURE_NOP_IO_DELAY )) pv_cpu_ops.io_delay = kvm_io_delay;
arch/x86/kernel/kvmclock.c +0 -1
@@ -263,7 +263,6 @@ void __init kvmclock_init(void)#endif kvm_get_preset_lpj ();clocksource_register_hz (&kvm_clock,NSEC_PER_SEC ); - pv_info.paravirt_enabled =1 ; pv_info.name ="KVM" ;if (kvm_para_has_feature (KVM_FEATURE_CLOCKSOURCE_STABLE_BIT ))
arch/x86/kernel/process_64.c +73 -28
138 lines not on this page · raw message
arch/x86/kernel/tls.c +39 -0
@@ -27,6 +27,37 @@ static int get_free_idx(void)return -ESRCH ; } +static bool tls_desc_okay (const struct user_desc *info) +{ +if (LDT_empty (info)) +return true; + +/* +* espfix is required for 16-bit data segments, but espfix +* only works for LDT segments. +*/ +if (!info->seg_32bit) +return false; + +/* Only allow data segments in the TLS array. */ +if (info->contents >1 ) +return false; + +/* +* Non-present segments with DPL 3 present an interesting attack +* surface. The kernel should handle such segments correctly, +* but TLS is very difficult to protect in a sandbox, so prevent +* such segments from being created. +* +* If userspace needs to remove a TLS entry, it can still delete +* it outright. +*/ +if (info->seg_not_present) +return false; + +return true; +} +static void set_tls_desc (struct task_struct *p,int idx,const struct user_desc *info,int n) {
@@ -66,6 +97,9 @@ int do_set_thread_area(struct task_struct *p, int idx,if (copy_from_user (&info, u_info,sizeof (info)))return -EFAULT ; +if (!tls_desc_okay (&info)) +return -EINVAL ; +if (idx ==-1 ) idx = info.entry_number;
@@ -192,6 +226,7 @@ int regset_tls_set(struct task_struct *target, const struct user_regset *regset, {struct user_desc infobuf[GDT_ENTRY_TLS_ENTRIES ];const struct user_desc *info; +int i; if (pos >= GDT_ENTRY_TLS_ENTRIES * sizeof(struct user_desc) || (pos % sizeof(struct user_desc)) != 0 ||
@@ -205,6 +240,10 @@ int regset_tls_set(struct task_struct *target, const struct user_regset *regset,else info = infobuf; +for (i =0 ; i < count /sizeof (struct user_desc ); i++) +if (!tls_desc_okay (info + i)) +return -EINVAL ; +set_tls_desc (target,GDT_ENTRY_TLS_MIN + (pos /sizeof (struct user_desc )), info, count /sizeof (struct user_desc ));
crypto/af_alg.c +3 -0
@@ -449,6 +449,9 @@ void af_alg_complete(struct crypto_async_request *req, int err) {struct af_alg_completion *completion = req->data; +if (err == -EINPROGRESS ) +return ; + completion->err = err;complete (&completion->completion); }
drivers/md/bitmap.c +6 -10
@@ -883,7 +883,6 @@ void bitmap_unplug(struct bitmap *bitmap) {unsigned long i;int dirty, need_write; -int wait =0 ;if (!bitmap || !bitmap->storage.filemap ||test_bit (BITMAP_STALE , &bitmap->flags))
@@ -901,16 +900,13 @@ void bitmap_unplug(struct bitmap *bitmap)clear_page_attr (bitmap, i,BITMAP_PAGE_PENDING );write_page (bitmap, bitmap->storage.filemap[i],0 ); } -if (dirty) - wait =1 ; - } -if (wait) {/* if any writes were performed, we need to wait on them */ -if (bitmap->storage.file) -wait_event (bitmap->write_wait, -atomic_read (&bitmap->pending_writes)==0 ); -else -md_super_wait (bitmap->mddev); } +if (bitmap->storage.file) +wait_event (bitmap->write_wait, +atomic_read (&bitmap->pending_writes)==0 ); +else +md_super_wait (bitmap->mddev); +if (test_bit (BITMAP_WRITE_ERROR , &bitmap->flags))bitmap_file_kick (bitmap); }
drivers/md/dm-bufio.c +19 -1
@@ -532,6 +532,19 @@ static void use_dmio(struct dm_buffer *b, int rw, sector_t block,end_io (&b->bio, r); } +static void inline_endio (struct bio *bio,int error) +{ +bio_end_io_t *end_fn = bio->bi_private; + +/* +* Reset the bio to free any attached resources +* (e.g. bio integrity profiles). +*/ +bio_reset (bio); + +end_fn (bio, error); +} +static void use_inline_bio (struct dm_buffer *b,int rw,sector_t block,bio_end_io_t *end_io) {
@@ -543,7 +556,12 @@ static void use_inline_bio(struct dm_buffer *b, int rw, sector_t block, b->bio.bi_max_vecs =DM_BUFIO_INLINE_VECS ; b->bio.bi_iter.bi_sector = block << b->c->sectors_per_block_bits; b->bio.bi_bdev = b->c->bdev; - b->bio.bi_end_io = end_io; + b->bio.bi_end_io = inline_endio; +/* +* Use of .bi_private isn't a problem here because +* the dm_buffer's inline bio is local to bufio. +*/ + b->bio.bi_private = end_io;/* * We assume that if len >= PAGE_SIZE ptr is page-aligned.
drivers/md/dm-cache-target.c +9 -4
@@ -946,10 +946,14 @@ static void migration_success_post_commit(struct dm_cache_migration *mg) } }else { -clear_dirty (cache, mg->new_oblock, mg->cblock); -if (mg->requeue_holder) +if (mg->requeue_holder) { +clear_dirty (cache, mg->new_oblock, mg->cblock);cell_defer (cache, mg->new_ocell, true); -else { + }else { +/* +* The block was promoted via an overwrite, so it's dirty. +*/ +set_dirty (cache, mg->new_oblock, mg->cblock);bio_endio (mg->new_ocell->holder,0 );cell_defer (cache, mg->new_ocell, false); }
@@ -1060,7 +1064,8 @@ static void issue_copy(struct dm_cache_migration *mg) avoid =is_discarded_oblock (cache, mg->new_oblock); -if (!avoid &&bio_writes_complete_block (cache, bio)) { +if (writeback_mode (&cache->features) && + !avoid &&bio_writes_complete_block (cache, bio)) {issue_overwrite (mg, bio);return ; }
drivers/md/dm-crypt.c +1 -1
@@ -709,7 +709,7 @@ static int crypt_iv_tcw_whitening(struct crypt_config *cc,for (i =0 ; i < ((1 <<SECTOR_SHIFT ) /8 ); i++)crypto_xor (data + i *8 , buf,8 ); out: -memset (buf,0 ,sizeof (buf)); +memzero_explicit (buf,sizeof (buf));return r; }
drivers/md/dm-thin.c +21 -3
@@ -916,6 +916,24 @@ static void schedule_zero(struct thin_c *tc, dm_block_t virt_block, } } +static void set_pool_mode (struct pool *pool,enum pool_mode new_mode); + +static void check_for_space (struct pool *pool) +{ +int r; +dm_block_t nr_free; + +if (get_pool_mode (pool) !=PM_OUT_OF_DATA_SPACE ) +return ; + + r =dm_pool_get_free_block_count (pool->pmd, &nr_free); +if (r) +return ; + +if (nr_free) +set_pool_mode (pool,PM_WRITE ); +} +/* * A non-zero return indicates read_only or fail_io mode. * Many callers don't care about the return value.
@@ -930,6 +948,8 @@ static int commit(struct pool *pool) r =dm_pool_commit_metadata (pool->pmd);if (r)metadata_operation_failed (pool,"dm_pool_commit_metadata" , r); +else +check_for_space (pool);return r; }
@@ -948,8 +968,6 @@ static void check_low_water_mark(struct pool *pool, dm_block_t free_blocks) } } -static void set_pool_mode (struct pool *pool,enum pool_mode new_mode); -static int alloc_data_block (struct thin_c *tc,dm_block_t *result) {int r;
@@ -1592,7 +1610,7 @@ static void set_pool_mode(struct pool *pool, enum pool_mode new_mode) pool->process_bio = process_bio_read_only; pool->process_discard = process_discard; pool->process_prepared_mapping = process_prepared_mapping; - pool->process_prepared_discard = process_prepared_discard_passdown; + pool->process_prepared_discard = process_prepared_discard;if (!pool->pf.error_if_no_space && no_space_timeout)queue_delayed_work (pool->wq, &pool->no_space_timeout, no_space_timeout);
drivers/md/persistent-data/dm-space-map-metadata.c +3 -1
@@ -564,7 +564,9 @@ static int sm_bootstrap_get_nr_blocks(struct dm_space_map *sm, dm_block_t *count { struct sm_metadata *smm = container_of(sm, struct sm_metadata, sm); -return smm->ll.nr_blocks; + *count = smm->ll.nr_blocks; + +return 0 ; }static int sm_bootstrap_get_nr_free (struct dm_space_map *sm,dm_block_t *count)
drivers/mfd/tc6393xb.c +12 -1
@@ -263,6 +263,17 @@ static int tc6393xb_ohci_disable(struct platform_device *dev)return 0 ; } +static int tc6393xb_ohci_suspend (struct platform_device *dev) +{ +struct tc6393xb_platform_data *tcpd =dev_get_platdata (dev->dev.parent); + +/* We can't properly store/restore OHCI state, so fail here */ +if (tcpd->resume_restore) +return -EBUSY ; + +return tc6393xb_ohci_disable (dev); +} +static int tc6393xb_fb_enable (struct platform_device *dev) {struct tc6393xb *tc6393xb =dev_get_drvdata (dev->dev.parent);
@@ -403,7 +414,7 @@ static struct mfd_cell tc6393xb_cells[] = { .num_resources = ARRAY_SIZE(tc6393xb_ohci_resources), .resources = tc6393xb_ohci_resources, .enable = tc6393xb_ohci_enable, - .suspend = tc6393xb_ohci_disable, + .suspend = tc6393xb_ohci_suspend, .resume = tc6393xb_ohci_enable, .disable = tc6393xb_ohci_disable, },
drivers/mmc/card/block.c +1 -1
@@ -260,7 +260,7 @@ static ssize_t force_ro_show(struct device *dev, struct device_attribute *attr,int ret;struct mmc_blk_data *md =mmc_blk_get (dev_to_disk (dev)); - ret =snprintf (buf,PAGE_SIZE ,"%d" , + ret =snprintf (buf,PAGE_SIZE ,"%d\n" ,get_disk_ro (dev_to_disk (dev)) ^ md->read_only);mmc_blk_put (md);
drivers/mmc/host/dw_mmc.c +7 -0
@@ -632,6 +632,13 @@ static void dw_mci_ctrl_rd_thld(struct dw_mci *host, struct mmc_data *data)WARN_ON (!(data->flags &MMC_DATA_READ )); +/* +* CDTHRCTL doesn't exist prior to 240A (in fact that register offset is +* in the FIFO region, so we really shouldn't access it). +*/ +if (host->verid <DW_MMC_240A ) +return ; +if (host->timing !=MMC_TIMING_MMC_HS200 && host->timing !=MMC_TIMING_UHS_SDR104 ) goto disable;
drivers/mmc/host/sdhci-pci-o2micro.c +0 -2
@@ -88,8 +88,6 @@ void sdhci_pci_o2_fujin2_pci_init(struct sdhci_pci_chip *chip)return ; scratch_32 &= ~((1 <<21 ) | (1 <<30 )); -/* Set RTD3 function disabled */ - scratch_32 |= ((1 <<29 ) | (1 <<28 ));pci_write_config_dword (chip->pdev,O2_SD_FUNC_REG3 , scratch_32);/* Set L1 Entrance Timer */
drivers/scsi/NCR5380.c +6 -6
@@ -2655,14 +2655,14 @@ static void NCR5380_dma_complete(NCR5380_instance * instance) {* * Purpose : abort a command * -* Inputs : cmd - the Scsi_Cmnd to abort, code - code to set the -* host byte of the result field to, if zero DID_ABORTED is +* Inputs : cmd - the Scsi_Cmnd to abort, code - code to set the +* host byte of the result field to, if zero DID_ABORTED is * used. * -* Returns : 0 - success, -1 on failure. +* Returns : SUCCESS - success, FAILED on failure. * -* XXX - there is no way to abort the command that is currently -* connected, you have to wait for it to complete. If this is +* XXX - there is no way to abort the command that is currently +* connected, you have to wait for it to complete. If this is * a problem, we could implement longjmp() / setjmp(), setjmp() * called where the loop started in NCR5380_main(). *
@@ -2712,7 +2712,7 @@ static int NCR5380_abort(Scsi_Cmnd * cmd) {* aborted flag and get back into our main loop. */ - return 0; + return SUCCESS; }#endif
drivers/scsi/aha1740.c +1 -1
@@ -531,7 +531,7 @@ static int aha1740_eh_abort_handler (Scsi_Cmnd *dummy)* quiet as possible... */ -return 0 ; +return SUCCESS ; }static struct scsi_host_template aha1740_template = {
drivers/scsi/atari_NCR5380.c +1 -1
@@ -2613,7 +2613,7 @@ static void NCR5380_reselect(struct Scsi_Host *instance)* host byte of the result field to, if zero DID_ABORTED is * used. * -* Returns : 0 - success, -1 on failure. +* Returns : SUCCESS - success, FAILED on failure. * * XXX - there is no way to abort the command that is currently * connected, you have to wait for it to complete. If this is
drivers/scsi/esas2r/esas2r_main.c +1 -1
@@ -1057,7 +1057,7 @@ int esas2r_eh_abort(struct scsi_cmnd *cmd) cmd->scsi_done (cmd); -return 0 ; +return SUCCESS ; }spin_lock_irqsave (&a->queue_lock, flags);
drivers/scsi/megaraid.c +4 -4
@@ -1967,7 +1967,7 @@ megaraid_abort_and_reset(adapter_t *adapter, Scsi_Cmnd *cmd, int aor) cmd->device->id, cmd->device->lun);if (list_empty (&adapter->pending_list)) -return FALSE; +return FAILED ;list_for_each_safe (pos, next, &adapter->pending_list) {
@@ -1990,7 +1990,7 @@ megaraid_abort_and_reset(adapter_t *adapter, Scsi_Cmnd *cmd, int aor) (aor==SCB_ABORT ) ?"ABORTING" :"RESET" , scb->idx); -return FALSE; +return FAILED ; }else {
@@ -2015,12 +2015,12 @@ megaraid_abort_and_reset(adapter_t *adapter, Scsi_Cmnd *cmd, int aor)list_add_tail (SCSI_LIST (cmd), &adapter->completed_list); -return TRUE; +return SUCCESS ; } } } -return FALSE; +return FAILED ; } static inline int
drivers/scsi/megaraid/megaraid_sas_base.c +1 -1
@@ -953,7 +953,7 @@ megasas_issue_blocked_abort_cmd(struct megasas_instance *instance,cpu_to_le32 (upper_32_bits (cmd_to_abort->frame_phys_addr)); cmd->sync_cmd =1 ; - cmd->cmd_status =0xFF ; + cmd->cmd_status =ENODATA ; instance->instancet->issue_dcmd (instance, cmd);
drivers/scsi/sun3_NCR5380.c +5 -5
@@ -2597,15 +2597,15 @@ static void NCR5380_reselect (struct Scsi_Host *instance)* Purpose : abort a command * * Inputs : cmd - the struct scsi_cmnd to abort, code - code to set the -* host byte of the result field to, if zero DID_ABORTED is +* host byte of the result field to, if zero DID_ABORTED is * used. * -* Returns : 0 - success, -1 on failure. +* Returns : SUCCESS - success, FAILED on failure. * -* XXX - there is no way to abort the command that is currently -* connected, you have to wait for it to complete. If this is +* XXX - there is no way to abort the command that is currently +* connected, you have to wait for it to complete. If this is * a problem, we could implement longjmp() / setjmp(), setjmp() -* called where the loop started in NCR5380_main(). +* called where the loop started in NCR5380_main(). */ static int NCR5380_abort (struct scsi_cmnd *cmd)
drivers/thermal/thermal_core.c +2 -2
@@ -1824,10 +1824,10 @@ static int __init thermal_init(void) exit_netlink:genetlink_exit (); -unregister_governors: -thermal_unregister_governors (); unregister_class:class_unregister (&thermal_class); +unregister_governors: +thermal_unregister_governors (); error:idr_destroy (&thermal_tz_idr);idr_destroy (&thermal_cdev_idr);
fs/btrfs/disk-io.c +0 -6
@@ -3978,12 +3978,6 @@ again:if (ret)break ; -/* opt_discard */ -if (btrfs_test_opt (root,DISCARD )) - ret =btrfs_error_discard_extent (root, start, - end +1 - start, -NULL ); -clear_extent_dirty (unpin, start, end,GFP_NOFS );btrfs_error_unpin_extent_range (root, start, end);cond_resched ();
fs/btrfs/extent-tree.c +6 -4
@@ -5503,7 +5503,8 @@ void btrfs_prepare_extent_commit(struct btrfs_trans_handle *trans,update_global_block_rsv (fs_info); } -static int unpin_extent_range (struct btrfs_root *root,u64 start,u64 end) +static int unpin_extent_range (struct btrfs_root *root,u64 start,u64 end, +const bool return_free_space) {struct btrfs_fs_info *fs_info = root->fs_info;struct btrfs_block_group_cache *cache =NULL ;
@@ -5527,7 +5528,8 @@ static int unpin_extent_range(struct btrfs_root *root, u64 start, u64 end)if (start < cache->last_byte_to_unpin) { len =min (len, cache->last_byte_to_unpin - start); -btrfs_add_free_space (cache, start, len); +if (return_free_space) +btrfs_add_free_space (cache, start, len); } start += len;
@@ -5590,7 +5592,7 @@ int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans, end + 1 - start, NULL);clear_extent_dirty (unpin, start, end,GFP_NOFS ); -unpin_extent_range (root, start, end); +unpin_extent_range (root, start, end, true);cond_resched (); }
@@ -8886,7 +8888,7 @@ out:int btrfs_error_unpin_extent_range (struct btrfs_root *root,u64 start,u64 end) { -return unpin_extent_range (root, start, end); +return unpin_extent_range (root, start, end, false); } int btrfs_error_discard_extent(struct btrfs_root *root, u64 bytenr,
fs/btrfs/extent_map.c +0 -2
@@ -290,8 +290,6 @@ int unpin_extent_cache(struct extent_map_tree *tree, u64 start, u64 len,if (!em) goto out; -if (!test_bit (EXTENT_FLAG_LOGGING , &em->flags)) -list_move (&em->list, &tree->modified_extents); em->generation = gen;clear_bit (EXTENT_FLAG_PINNED , &em->flags); em->mod_start = em->start;
fs/ecryptfs/crypto.c +0 -1
@@ -1917,7 +1917,6 @@ ecryptfs_decode_from_filename(unsigned char *dst, size_t *dst_size,break ;case 2 : dst[dst_byte_offset++] |= (src_byte); - dst[dst_byte_offset] =0 ; current_bit_offset =0 ;break ; }
fs/ecryptfs/file.c +0 -12
@@ -191,23 +191,11 @@ static int ecryptfs_open(struct inode *inode, struct file *file) {int rc =0 ;struct ecryptfs_crypt_stat *crypt_stat =NULL ; -struct ecryptfs_mount_crypt_stat *mount_crypt_stat;struct dentry *ecryptfs_dentry = file->f_path.dentry;/* Private value of ecryptfs_dentry allocated in * ecryptfs_lookup() */ struct ecryptfs_file_info *file_info; - mount_crypt_stat = &ecryptfs_superblock_to_private ( - ecryptfs_dentry->d_sb)->mount_crypt_stat; -if ((mount_crypt_stat->flags &ECRYPTFS_ENCRYPTED_VIEW_ENABLED ) - && ((file->f_flags &O_WRONLY ) || (file->f_flags &O_RDWR ) - || (file->f_flags &O_CREAT ) || (file->f_flags &O_TRUNC ) - || (file->f_flags &O_APPEND ))) { -printk (KERN_WARNING "Mount has encrypted view enabled; " -"files may only be read\n" ); - rc = -EPERM ; - goto out; - }/* Released in ecryptfs_release or end of function if failure */ file_info =kmem_cache_zalloc (ecryptfs_file_info_cache,GFP_KERNEL );ecryptfs_set_file_private (file, file_info);
fs/ecryptfs/main.c +13 -3
@@ -493,6 +493,7 @@ static struct dentry *ecryptfs_mount(struct file_system_type *fs_type, int flags {struct super_block *s;struct ecryptfs_sb_info *sbi; +struct ecryptfs_mount_crypt_stat *mount_crypt_stat;struct ecryptfs_dentry_info *root_info;const char *err ="Getting sb failed" ;struct inode *inode;
@@ -511,6 +512,7 @@ static struct dentry *ecryptfs_mount(struct file_system_type *fs_type, int flags err ="Error parsing options" ; goto out; } + mount_crypt_stat = &sbi->mount_crypt_stat; s =sget (fs_type,NULL , set_anon_super, flags,NULL );if (IS_ERR (s)) {
@@ -557,11 +559,19 @@ static struct dentry *ecryptfs_mount(struct file_system_type *fs_type, int flags/** * Set the POSIX ACL flag based on whether they're enabled in the lower -* mount. Force a read-only eCryptfs mount if the lower mount is ro. -* Allow a ro eCryptfs mount even when the lower mount is rw. +* mount. */ s->s_flags = flags & ~MS_POSIXACL ; - s->s_flags |= path.dentry->d_sb->s_flags & (MS_RDONLY |MS_POSIXACL ); + s->s_flags |= path.dentry->d_sb->s_flags &MS_POSIXACL ; + +/** +* Force a read-only eCryptfs mount when: +* 1) The lower mount is ro +* 2) The ecryptfs_encrypted_view mount option is specified +*/ +if (path.dentry->d_sb->s_flags &MS_RDONLY || + mount_crypt_stat->flags &ECRYPTFS_ENCRYPTED_VIEW_ENABLED ) + s->s_flags |=MS_RDONLY ; s->s_maxbytes = path.dentry->d_sb->s_maxbytes; s->s_blocksize = path.dentry->d_sb->s_blocksize;
fs/isofs/rock.c +9 -0
@@ -30,6 +30,7 @@ struct rock_state {int cont_size;int cont_extent;int cont_offset; +int cont_loops;struct inode *inode; };
@@ -73,6 +74,9 @@ static void init_rock_state(struct rock_state *rs, struct inode *inode) rs->inode = inode; } +/* Maximum number of Rock Ridge continuation entries */ +#define RR_MAX_CE_ENTRIES 32 +/* * Returns 0 if the caller should continue scanning, 1 if the scan must end * and -ve on error.
@@ -105,6 +109,8 @@ static int rock_continue(struct rock_state *rs) goto out; } ret = -EIO ; +if (++rs->cont_loops >=RR_MAX_CE_ENTRIES ) + goto out; bh =sb_bread (rs->inode->i_sb, rs->cont_extent);if (bh) { memcpy(rs->buffer, bh->b_data + rs->cont_offset,
@@ -356,6 +362,9 @@ repeat: rs.cont_size =isonum_733 (rr->u.CE.size);break ;case SIG ('E' ,'R' ): +/* Invalid length of ER tag id? */ + if (rr->u.ER.len_id + offsetof(struct rock_ridge, u.ER.data) > rr->len) + goto out;ISOFS_SB (inode->i_sb)->s_rock =1 ;printk (KERN_DEBUG "ISO 9660 Extensions: " ); {
fs/namespace.c +12 -1
@@ -1295,6 +1295,8 @@ void umount_tree(struct mount *mnt, int how) }if (last) { last->mnt_hash.next = unmounted.first; +if (unmounted.first) + unmounted.first->pprev = &last->mnt_hash.next; unmounted.first = tmp_list.first; unmounted.first->pprev = &unmounted.first; }
@@ -1439,6 +1441,9 @@ SYSCALL_DEFINE2(umount, char __user *, name, int, flags) goto dput_and_out;if (mnt->mnt.mnt_flags &MNT_LOCKED ) goto dput_and_out; + retval = -EPERM ; +if (flags &MNT_FORCE && !capable (CAP_SYS_ADMIN )) + goto dput_and_out; retval =do_umount (mnt, flags); dput_and_out:
@@ -1964,7 +1969,13 @@ static int do_remount(struct path *path, int flags, int mnt_flags, }if ((mnt->mnt.mnt_flags &MNT_LOCK_NODEV ) && !(mnt_flags &MNT_NODEV )) { -return -EPERM ; +/* Was the nodev implicitly added in mount? */ +if ((mnt->mnt_ns->user_ns != &init_user_ns) && + !(sb->s_type->fs_flags &FS_USERNS_DEV_MOUNT )) { + mnt_flags |=MNT_NODEV ; + }else { +return -EPERM ; + } }if ((mnt->mnt.mnt_flags &MNT_LOCK_NOSUID ) && !(mnt_flags &MNT_NOSUID )) {
fs/ncpfs/ioctl.c +0 -1
@@ -448,7 +448,6 @@ static long __ncp_ioctl(struct inode *inode, unsigned int cmd, unsigned long arg result = -EIO ; } } - result =0 ; }mutex_unlock (&server->root_setup_lock);
fs/nfs/nfs4proc.c +3 -3
@@ -7589,6 +7589,9 @@ nfs4_proc_layoutget(struct nfs4_layoutget *lgp, gfp_t gfp_flags)dprintk ("--> %s\n" , __func__); +/* nfs4_layoutget_release calls pnfs_put_layout_hdr */ +pnfs_get_layout_hdr (NFS_I (inode)->layout); + lgp->args.layout.pages =nfs4_alloc_pages (max_pages, gfp_flags);if (!lgp->args.layout.pages) {nfs4_layoutget_release (lgp);
@@ -7601,9 +7604,6 @@ nfs4_proc_layoutget(struct nfs4_layoutget *lgp, gfp_t gfp_flags) lgp->res.seq_res.sr_slot =NULL ;nfs4_init_sequence (&lgp->args.seq_args, &lgp->res.seq_res,0 ); -/* nfs4_layoutget_release calls pnfs_put_layout_hdr */ -pnfs_get_layout_hdr (NFS_I (inode)->layout); - task =rpc_run_task (&task_setup_data);if (IS_ERR (task))return ERR_CAST (task);
fs/proc/base.c +53 -0
71 lines not on this page · raw message
fs/udf/symlink.c +13 -4
@@ -80,11 +80,17 @@ static int udf_symlink_filler(struct file *file, struct page *page)struct inode *inode = page->mapping->host;struct buffer_head *bh =NULL ;unsigned char *symlink; -int err = -EIO ; +int err;unsigned char *p =kmap (page);struct udf_inode_info *iinfo;uint32_t pos; +/* We don't support symlinks longer than one block */ +if (inode->i_size > inode->i_sb->s_blocksize) { + err = -ENAMETOOLONG ; + goto out_unmap; + } + iinfo =UDF_I (inode); pos =udf_block_map (inode,0 );
@@ -94,8 +100,10 @@ static int udf_symlink_filler(struct file *file, struct page *page) }else { bh =sb_bread (inode->i_sb, pos); -if (!bh) - goto out; +if (!bh) { + err = -EIO ; + goto out_unlock_inode; + } symlink = bh->b_data; }
@@ -109,9 +117,10 @@ static int udf_symlink_filler(struct file *file, struct page *page)unlock_page (page);return 0 ; -out: +out_unlock_inode:up_read (&iinfo->i_data_sem);SetPageError (page); +out_unmap:kunmap (page);unlock_page (page);return err;
include/linux/audit.h +4 -0
@@ -47,6 +47,7 @@ struct sk_buff;struct audit_krule {int vers_ops; +u32 pflags;u32 flags;u32 listnr;u32 action;
@@ -64,6 +65,9 @@ struct audit_krule {u64 prio; }; +/* Flag to indicate legacy AUDIT_LOGINUID unset usage */ +#define AUDIT_LOGINUID_LEGACY 0x1 +struct audit_field {u32 type;u32 val;
include/linux/cred.h +1 -0
@@ -68,6 +68,7 @@ extern void groups_free(struct group_info *);extern int set_current_groups (struct group_info *);extern int set_groups (struct cred *,struct group_info *);extern int groups_search (const struct group_info *,kgid_t ); +extern bool may_setgroups (void );/* access the groups "array" with this macro */ #define GROUP_AT (gi, i) \
include/linux/user_namespace.h +12 -0
@@ -17,6 +17,10 @@ struct uid_gid_map { /* 64 bytes -- 1 cache line */ } extent[UID_GID_MAP_MAX_EXTENTS ]; }; +#define USERNS_SETGROUPS_ALLOWED 1UL + +#define USERNS_INIT_FLAGS USERNS_SETGROUPS_ALLOWED +struct user_namespace {struct uid_gid_map uid_map;struct uid_gid_map gid_map;
@@ -27,6 +31,7 @@ struct user_namespace {kuid_t owner;kgid_t group;unsigned int proc_inum; +unsigned long flags;/* Register of per-UID persistent keyrings for this namespace */ #ifdef CONFIG_PERSISTENT_KEYRINGS
@@ -63,6 +68,9 @@ extern struct seq_operations proc_projid_seq_operations;extern ssize_t proc_uid_map_write (struct file *,const char __user *,size_t ,loff_t *);extern ssize_t proc_gid_map_write (struct file *,const char __user *,size_t ,loff_t *);extern ssize_t proc_projid_map_write (struct file *,const char __user *,size_t ,loff_t *); +extern ssize_t proc_setgroups_write (struct file *,const char __user *,size_t ,loff_t *); +extern int proc_setgroups_show (struct seq_file *m,void *v); +extern bool userns_may_setgroups (const struct user_namespace *ns);#else static inline struct user_namespace *get_user_ns (struct user_namespace *ns)
@@ -87,6 +95,10 @@ static inline void put_user_ns(struct user_namespace *ns) { } +static inline bool userns_may_setgroups (const struct user_namespace *ns) +{ +return true; +}#endif #endif /* _LINUX_USER_H */
kernel/auditfilter.c +10 -0
@@ -429,6 +429,7 @@ static struct audit_entry *audit_data_to_entry(struct audit_rule_data *data,if ((f->type ==AUDIT_LOGINUID ) && (f->val ==AUDIT_UID_UNSET )) { f->type =AUDIT_LOGINUID_SET ; f->val =0 ; + entry->rule.pflags |=AUDIT_LOGINUID_LEGACY ; } err =audit_field_valid (entry, f);
@@ -604,6 +605,13 @@ static struct audit_rule_data *audit_krule_to_data(struct audit_krule *krule) data->buflen += data->values[i] =audit_pack_string (&bufp, krule->filterkey);break ; +case AUDIT_LOGINUID_SET : +if (krule->pflags &AUDIT_LOGINUID_LEGACY && !f->val) { + data->fields[i] =AUDIT_LOGINUID ; + data->values[i] =AUDIT_UID_UNSET ; +break ; + } +/* fallthrough if set */ default : data->values[i] = f->val; }
@@ -620,6 +628,7 @@ static int audit_compare_rule(struct audit_krule *a, struct audit_krule *b)int i;if (a->flags != b->flags || + a->pflags != b->pflags || a->listnr != b->listnr || a->action != b->action || a->field_count != b->field_count)
@@ -738,6 +747,7 @@ struct audit_entry *audit_dupe_rule(struct audit_krule *old) new = &entry->rule; new->vers_ops = old->vers_ops; new->flags = old->flags; + new->pflags = old->pflags; new->listnr = old->listnr; new->action = old->action;for (i =0 ; i <AUDIT_BITMASK_SIZE ; i++)
kernel/groups.c +10 -1
@@ -6,6 +6,7 @@#include <linux/slab.h> #include <linux/security.h> #include <linux/syscalls.h> +#include <linux/user_namespace.h> #include <asm/uaccess.h> /* init to 2 - one for init_task, one to ensure it is never freed */
@@ -223,6 +224,14 @@ out:return i; } +bool may_setgroups (void ) +{ +struct user_namespace *user_ns =current_user_ns (); + +return ns_capable (user_ns,CAP_SETGID ) && +userns_may_setgroups (user_ns); +} +/* * SMP: Our groups are copy-on-write. We can set them safely * without another task interfering.
@@ -233,7 +242,7 @@ SYSCALL_DEFINE2(setgroups, int, gidsetsize, gid_t __user *, grouplist)struct group_info *group_info;int retval; -if (!ns_capable (current_user_ns (),CAP_SETGID )) +if (!may_setgroups ())return -EPERM ;if ((unsigned )gidsetsize >NGROUPS_MAX )return -EINVAL ;
kernel/pid.c +2 -0
@@ -341,6 +341,8 @@ out: out_unlock:spin_unlock_irq (&pidmap_lock); +put_pid_ns (ns); + out_free:while (++i <= ns->level)free_pidmap (pid->numbers + i);
kernel/uid16.c +1 -1
@@ -176,7 +176,7 @@ SYSCALL_DEFINE2(setgroups16, int, gidsetsize, old_gid_t __user *, grouplist)struct group_info *group_info;int retval; -if (!ns_capable (current_user_ns (),CAP_SETGID )) +if (!may_setgroups ())return -EPERM ;if ((unsigned )gidsetsize >NGROUPS_MAX )return -EINVAL ;
kernel/user.c +1 -0
@@ -51,6 +51,7 @@ struct user_namespace init_user_ns = { .owner = GLOBAL_ROOT_UID, .group = GLOBAL_ROOT_GID, .proc_inum = PROC_USER_INIT_INO, + .flags =USERNS_INIT_FLAGS , #ifdef CONFIG_PERSISTENT_KEYRINGS .persistent_keyring_register_sem = __RWSEM_INITIALIZER(init_user_ns.persistent_keyring_register_sem),
kernel/user_namespace.c +113 -12
178 lines not on this page · raw message
net/mac80211/key.c +1 -1
@@ -652,7 +652,7 @@ void ieee80211_free_sta_keys(struct ieee80211_local *local,int i;mutex_lock (&local->key_mtx); -for (i =0 ; i <NUM_DEFAULT_KEYS ; i++) { +for (i =0 ; i <ARRAY_SIZE (sta->gtk); i++) { key =key_mtx_dereference (local, sta->gtk[i]);if (!key)continue ;
net/mac80211/rx.c +6 -5
@@ -1679,14 +1679,14 @@ ieee80211_rx_h_defragment(struct ieee80211_rx_data *rx) sc =le16_to_cpu (hdr->seq_ctrl); frag = sc &IEEE80211_SCTL_FRAG ; -if (likely (!ieee80211_has_morefrags (fc) && frag ==0 )) - goto out; -if (is_multicast_ether_addr (hdr->addr1)) { rx->local->dot11MulticastReceivedFrameCount++; - goto out; + goto out_no_led; } +if (likely (!ieee80211_has_morefrags (fc) && frag ==0 )) + goto out; +I802_DEBUG_INC (rx->local->rx_handlers_fragments);if (skb_linearize (rx->skb))
@@ -1777,9 +1777,10 @@ ieee80211_rx_h_defragment(struct ieee80211_rx_data *rx) status->rx_flags |=IEEE80211_RX_FRAGMENTED ; out: +ieee80211_led_rx (rx->local); + out_no_led:if (rx->sta) rx->sta->rx_packets++; -ieee80211_led_rx (rx->local);return RX_CONTINUE ; }
security/keys/encrypted-keys/encrypted.c +4 -1
@@ -1018,10 +1018,13 @@ static int __init init_encrypted(void) ret =encrypted_shash_alloc ();if (ret <0 )return ret; + ret =aes_get_sizes (); +if (ret <0 ) + goto out; ret =register_key_type (&key_type_encrypted);if (ret <0 ) goto out; -return aes_get_sizes (); +return 0 ; out:encrypted_shash_release ();return ret;
tools/testing/selftests/mount/unprivileged-remount-test.c +166 -38
303 lines not on this page · raw message