Linux 4.12.13
Greg KH
maintainerI'm announcing the release of the 4.12.13 kernel.
All users of the 4.12 kernel series must upgrade.
The updated 4.12.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.12.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/mm/fault.c | 5 arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 1 arch/x86/kvm/mmu.c | 3 drivers/mtd/nand/mxc_nand.c | 7 drivers/mtd/nand/nand_base.c | 7 drivers/mtd/nand/nand_hynix.c | 4 drivers/mtd/nand/qcom_nandc.c | 18 + drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 5 drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c | 5 drivers/nvme/host/fabrics.c | 2 fs/btrfs/super.c | 2 fs/nfs/file.c | 6 fs/nfs/internal.h | 1 fs/nfs/pagelist.c | 99 +++++----- fs/nfs/pnfs.c | 2 fs/xfs/xfs_linux.h | 9 lib/radix-tree.c | 9 mm/memory.c | 10 - mm/swapfile.c | 3 net/bluetooth/l2cap_core.c | 80 ++++---- sound/isa/msnd/msnd_midi.c | 30 +-- sound/isa/msnd/msnd_pinnacle.c | 23 +- tools/testing/selftests/x86/fsgsbase.c | 41 +++- 24 files changed, 222 insertions(+), 152 deletions(-)
Abhishek Sahu (2):
mtd: nand: qcom: fix read failure without complete bootchain
mtd: nand: qcom: fix config error for BCH
Aleksa Sarai (1):
btrfs: resume qgroup rescan on rw remount
Andy Lutomirski (1):
selftests/x86/fsgsbase: Test selectors 1, 2, and 3
Ben Seri (1):
Bluetooth: Properly check L2CAP config option output buffer length
Boris Brezillon (1):
mtd: nand: mxc: Fix mxc_v1 ooblayout
Brijesh Singh (1):
KVM: SVM: Limit PFERR_NESTED_GUEST_PAGE error_code check to L1 guest
Daniel Verkamp (1):
nvme-fabrics: generate spec-compliant UUID NQNs
Darrick J. Wong (1):
mm: kvfree the swap cluster info if the swap file is unsatisfactory
David Rientjes (1):
mm/swapfile.c: fix swapon frontswap_map memory leak on error
Eric Dumazet (1):
radix-tree: must check __radix_tree_preload() return value
Greg Kroah-Hartman (1):
Linux 4.12.13
Larry Finger (1):
rtlwifi: btcoexist: Fix breakage of ant_sel for rtl8723be
Laurent Dufour (1):
mm/memory.c: fix mem_cgroup_oom_disable() call missing
Lothar Waßmann (1):
mtd: nand: make Samsung SLC NAND usable again
Marc Zyngier (1):
ARM64: dts: marvell: armada-37xx: Fix GIC maintenance interrupt
Mark Rutland (1):
ARM: 8692/1: mm: abort uaccess retries upon fatal signal
Martin Blumenstingl (1):
mtd: nand: hynix: add support for 20nm NAND chips
Richard Wareing (1):
xfs: XFS_IS_REALTIME_INODE() should be false if no rt device present
Stanislaw Gruszka (1):
rt2800: fix TX_PIN_CFG setting for non MT7620 chips
Takashi Iwai (1):
ALSA: msnd: Optimize / harden DSP and MIDI loops
Trond Myklebust (2):
NFS: Fix 2 use after free issues in the I/O code
NFSv4: Fix up mirror allocation
[email protected] (1):
NFS: Sync the correct byte range during synchronous writes
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 12 -SUBLEVEL = 12 +SUBLEVEL = 13 EXTRAVERSION = NAME = Fearless Coyote
arch/arm/mm/fault.c +4 -1
@@ -315,8 +315,11 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)* signal first. We do not need to release the mmap_sem because * it would already be released in __lock_page_or_retry in * mm/filemap.c. */ -if ((fault &VM_FAULT_RETRY ) &&fatal_signal_pending (current)) +if ((fault &VM_FAULT_RETRY ) &&fatal_signal_pending (current)) { +if (!user_mode (regs)) + goto no_context;return 0 ; + }/* * Major/minor page fault accounting is only done on the
arch/arm64/boot/dts/marvell/armada-37xx.dtsi +1 -0
@@ -312,6 +312,7 @@ interrupt-controller; reg = <0x1d00000 0x10000>, /* GICD */ <0x1d40000 0x40000>; /* GICR */ + interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>; }; };
arch/x86/kvm/mmu.c +2 -1
@@ -4759,7 +4759,8 @@ int kvm_mmu_page_fault(struct kvm_vcpu *vcpu, gva_t cr2, u64 error_code,* Note: AMD only (since it supports the PFERR_GUEST_PAGE_MASK used * in PFERR_NEXT_GUEST_PAGE) */ -if (error_code ==PFERR_NESTED_GUEST_PAGE ) { +if (vcpu->arch.mmu.direct_map && + error_code ==PFERR_NESTED_GUEST_PAGE ) {kvm_mmu_unprotect_page (vcpu->kvm,gpa_to_gfn (cr2));return 1 ; }
drivers/mtd/nand/mxc_nand.c +4 -3
@@ -877,6 +877,8 @@ static void mxc_do_addr_cycle(struct mtd_info *mtd, int column, int page_addr) } } +#define MXC_V1_ECCBYTES 5 +static int mxc_v1_ooblayout_ecc (struct mtd_info *mtd,int section,struct mtd_oob_region *oobregion) {
@@ -886,7 +888,7 @@ static int mxc_v1_ooblayout_ecc(struct mtd_info *mtd, int section,return -ERANGE ; oobregion->offset = (section *16 ) +6 ; - oobregion->length = nand_chip->ecc.bytes; + oobregion->length =MXC_V1_ECCBYTES ;return 0 ; }
@@ -908,8 +910,7 @@ static int mxc_v1_ooblayout_free(struct mtd_info *mtd, int section, oobregion->length =4 ; } }else { - oobregion->offset = ((section -1 ) *16 ) + - nand_chip->ecc.bytes +6 ; + oobregion->offset = ((section -1 ) *16 ) +MXC_V1_ECCBYTES +6 ;if (section < nand_chip->ecc.steps) oobregion->length = (section *16 ) +6 - oobregion->offset;
drivers/mtd/nand/nand_base.c +5 -2
@@ -3972,10 +3972,13 @@ static void nand_manufacturer_detect(struct nand_chip *chip)* nand_decode_ext_id() otherwise. */ if (chip->manufacturer.desc && chip->manufacturer.desc->ops && - chip->manufacturer.desc->ops->detect) + chip->manufacturer.desc->ops->detect) { +/* The 3rd id byte holds MLC / multichip data */ + chip->bits_per_cell =nand_get_bits_per_cell (chip->id.data[2 ]); chip->manufacturer.desc->ops->detect (chip); -else + }else {nand_decode_ext_id (chip); + } }/*
drivers/mtd/nand/nand_hynix.c +2 -2
@@ -477,7 +477,7 @@ static void hynix_nand_extract_ecc_requirements(struct nand_chip *chip,* The ECC requirements field meaning depends on the * NAND technology. */ -u8 nand_tech = chip->id.data[5 ] &0x3 ; +u8 nand_tech = chip->id.data[5 ] &0x7 ;if (nand_tech <3 ) {/* > 26nm, reference: H27UBG8T2A datasheet */
@@ -533,7 +533,7 @@ static void hynix_nand_extract_scrambling_requirements(struct nand_chip *chip,if (nand_tech >0 ) chip->options |=NAND_NEED_SCRAMBLING ; }else { - nand_tech = chip->id.data[5 ] &0x3 ; + nand_tech = chip->id.data[5 ] &0x7 ;/* < 32nm */ if (nand_tech >2 )
drivers/mtd/nand/qcom_nandc.c +13 -5
@@ -109,7 +109,11 @@#define READ_ADDR 0/* NAND_DEV_CMD_VLD bits */ -#define READ_START_VLD 0 +#define READ_START_VLD BIT(0) +#define READ_STOP_VLD BIT(1) +#define WRITE_START_VLD BIT(2) +#define ERASE_START_VLD BIT(3) +#define SEQ_READ_START_VLD BIT(4)/* NAND_EBI2_ECC_BUF_CFG bits */ #define NUM_STEPS 0
@@ -148,6 +152,10 @@#define FETCH_ID 0xb#define RESET_DEVICE 0xd +/* Default Value for NAND_DEV_CMD_VLD */ +#define NAND_DEV_CMD_VLD_VAL (READ_START_VLD | WRITE_START_VLD | \ + ERASE_START_VLD | SEQ_READ_START_VLD) +/* * the NAND controller performs reads/writes with ECC in 516 byte chunks. * the driver calls the chunks 'step' or 'codeword' interchangeably
@@ -672,8 +680,7 @@ static int nandc_param(struct qcom_nand_host *host)/* configure CMD1 and VLD for ONFI param probing */ nandc_set_reg (nandc,NAND_DEV_CMD_VLD , - (nandc->vld & ~(1 <<READ_START_VLD )) - |0 <<READ_START_VLD ); + (nandc->vld & ~READ_START_VLD ));nandc_set_reg (nandc,NAND_DEV_CMD1 , (nandc->cmd1 & ~(0xFF <<READ_ADDR )) |NAND_CMD_PARAM <<READ_ADDR );
@@ -1893,7 +1900,7 @@ static int qcom_nand_host_setup(struct qcom_nand_host *host) | wide_bus << WIDE_FLASH |1 <<DEV0_CFG1_ECC_DISABLE ; - host->ecc_bch_cfg = host->bch_enabled <<ECC_CFG_ECC_DISABLE + host->ecc_bch_cfg = !host->bch_enabled <<ECC_CFG_ECC_DISABLE |0 <<ECC_SW_RESET | host->cw_data <<ECC_NUM_DATA_BYTES |1 <<ECC_FORCE_CLK_OPEN
@@ -1972,13 +1979,14 @@ static int qcom_nandc_setup(struct qcom_nand_controller *nandc) {/* kill onenand */ nandc_write (nandc,SFLASHC_BURST_CFG ,0 ); +nandc_write (nandc,NAND_DEV_CMD_VLD ,NAND_DEV_CMD_VLD_VAL );/* enable ADM DMA */ nandc_write (nandc,NAND_FLASH_CHIP_SELECT ,DM_EN );/* save the original values of these registers */ nandc->cmd1 =nandc_read (nandc,NAND_DEV_CMD1 ); - nandc->vld =nandc_read (nandc,NAND_DEV_CMD_VLD ); + nandc->vld =NAND_DEV_CMD_VLD_VAL ;return 0 ; }
drivers/net/wireless/ralink/rt2x00/rt2800lib.c +4 -1
@@ -3699,7 +3699,10 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,if (rt2x00_rt (rt2x00dev,RT3572 ))rt2800_rfcsr_write (rt2x00dev,8 ,0 ); -rt2800_register_read (rt2x00dev,TX_PIN_CFG , &tx_pin); +if (rt2x00_rt (rt2x00dev,RT6352 )) +rt2800_register_read (rt2x00dev,TX_PIN_CFG , &tx_pin); +else + tx_pin =0 ;switch (rt2x00dev->default_ant.tx_chain_num) {case 3 :
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c +4 -1
@@ -1153,7 +1153,10 @@ static void btc8723b2ant_set_ant_path(struct btc_coexist *btcoexist, }/* fixed internal switch S1->WiFi, S0->BT */ - btcoexist->btc_write_4byte (btcoexist,0x948 ,0x0 ); +if (board_info->btdm_ant_pos ==BTC_ANTENNA_AT_MAIN_PORT ) + btcoexist->btc_write_2byte (btcoexist,0x948 ,0x0 ); +else + btcoexist->btc_write_2byte (btcoexist,0x948 ,0x280 );switch (antpos_type) {case BTC_ANT_WIFI_AT_MAIN :
drivers/nvme/host/fabrics.c +1 -1
@@ -77,7 +77,7 @@ static struct nvmf_host *nvmf_host_default(void)kref_init (&host->ref);uuid_be_gen (&host->id);snprintf (host->nqn,NVMF_NQN_SIZE , -"nqn.2014-08.org.nvmexpress:NVMf:uuid:%pUb" , &host->id); +"nqn.2014-08.org.nvmexpress:uuid:%pUb" , &host->id);mutex_lock (&nvmf_hosts_mutex);list_add_tail (&host->list, &nvmf_hosts);
fs/btrfs/super.c +2 -0
@@ -1828,6 +1828,8 @@ static int btrfs_remount(struct super_block *sb, int *flags, char *data) goto restore; } +btrfs_qgroup_rescan_resume (fs_info); +if (!fs_info->uuid_root) {btrfs_info (fs_info,"creating UUID tree" ); ret =btrfs_create_uuid_tree (fs_info);
fs/nfs/file.c +3 -3
@@ -629,11 +629,11 @@ ssize_t nfs_file_write(struct kiocb *iocb, struct iov_iter *from)if (result <=0 ) goto out; - result =generic_write_sync (iocb, result); -if (result <0 ) - goto out; written = result; iocb->ki_pos += written; + result =generic_write_sync (iocb, written); +if (result <0 ) + goto out;/* Return error values */ if (nfs_need_check_write (file, inode)) {
fs/nfs/internal.h +0 -1
@@ -248,7 +248,6 @@ int nfs_iocounter_wait(struct nfs_lock_context *l_ctx);extern const struct nfs_pageio_ops nfs_pgio_rw_ops;struct nfs_pgio_header *nfs_pgio_header_alloc (const struct nfs_rw_ops *);void nfs_pgio_header_free (struct nfs_pgio_header *); -void nfs_pgio_data_destroy (struct nfs_pgio_header *);int nfs_generic_pgio (struct nfs_pageio_descriptor *,struct nfs_pgio_header *); int nfs_initiate_pgio(struct rpc_clnt *clnt, struct nfs_pgio_header *hdr, struct rpc_cred *cred, const struct nfs_rpc_ops *rpc_ops,
fs/nfs/pagelist.c +51 -48
157 lines not on this page · raw message
fs/nfs/pnfs.c +0 -2
@@ -2274,7 +2274,6 @@ pnfs_write_through_mds(struct nfs_pageio_descriptor *desc,nfs_pageio_reset_write_mds (desc); mirror->pg_recoalesce =1 ; } -nfs_pgio_data_destroy (hdr); hdr->release (hdr); }
@@ -2398,7 +2397,6 @@ pnfs_read_through_mds(struct nfs_pageio_descriptor *desc,nfs_pageio_reset_read_mds (desc); mirror->pg_recoalesce =1 ; } -nfs_pgio_data_destroy (hdr); hdr->release (hdr); }
fs/xfs/xfs_linux.h +8 -1
@@ -279,7 +279,14 @@ static inline __uint64_t howmany_64(__uint64_t x, __uint32_t y)#endif /* DEBUG */ #ifdef CONFIG_XFS_RT -#define XFS_IS_REALTIME_INODE (ip) ((ip)->i_d.di_flags & XFS_DIFLAG_REALTIME) + +/* +* make sure we ignore the inode flag if the filesystem doesn't have a +* configured realtime device. +*/ +#define XFS_IS_REALTIME_INODE (ip) \ + (((ip)->i_d.di_flags & XFS_DIFLAG_REALTIME) && \ + (ip)->i_mount->m_rtdev_targp)#else #define XFS_IS_REALTIME_INODE (ip) (0)#endif
lib/radix-tree.c +5 -4
@@ -463,7 +463,7 @@ radix_tree_node_free(struct radix_tree_node *node)* To make use of this facility, the radix tree must be initialised without * __GFP_DIRECT_RECLAIM being passed to INIT_RADIX_TREE(). */ -static int __radix_tree_preload (gfp_t gfp_mask,unsigned nr) +static __must_check int __radix_tree_preload (gfp_t gfp_mask,unsigned nr) {struct radix_tree_preload *rtp;struct radix_tree_node *node;
@@ -2103,7 +2103,8 @@ EXPORT_SYMBOL(radix_tree_tagged);*/ void idr_preload (gfp_t gfp_mask) { -__radix_tree_preload (gfp_mask,IDR_PRELOAD_SIZE ); +if (__radix_tree_preload (gfp_mask,IDR_PRELOAD_SIZE )) +preempt_disable (); }EXPORT_SYMBOL (idr_preload);
@@ -2117,13 +2118,13 @@ EXPORT_SYMBOL(idr_preload);*/ int ida_pre_get (struct ida *ida,gfp_t gfp) { -__radix_tree_preload (gfp,IDA_PRELOAD_SIZE );/* * The IDA API has no preload_end() equivalent. Instead, * ida_get_new() can return -EAGAIN, prompting the caller * to return to the ida_pre_get() step. */ -preempt_enable (); +if (!__radix_tree_preload (gfp,IDA_PRELOAD_SIZE )) +preempt_enable ();if (!this_cpu_read (ida_bitmap)) {struct ida_bitmap *bitmap =kmalloc (sizeof (*bitmap), gfp);
mm/memory.c +5 -5
@@ -3843,6 +3843,11 @@ int handle_mm_fault(struct vm_area_struct *vma, unsigned long address,/* do counter updates before entering really critical section. */ check_sync_rss_stat (current); +if (!arch_vma_access_permitted (vma, flags &FAULT_FLAG_WRITE , + flags &FAULT_FLAG_INSTRUCTION , + flags &FAULT_FLAG_REMOTE )) +return VM_FAULT_SIGSEGV ; +/* * Enable the memcg OOM handling for faults triggered in user * space. Kernel faults are handled more gracefully.
@@ -3850,11 +3855,6 @@ int handle_mm_fault(struct vm_area_struct *vma, unsigned long address,if (flags &FAULT_FLAG_USER )mem_cgroup_oom_enable (); -if (!arch_vma_access_permitted (vma, flags &FAULT_FLAG_WRITE , - flags &FAULT_FLAG_INSTRUCTION , - flags &FAULT_FLAG_REMOTE )) -return VM_FAULT_SIGSEGV ; -if (unlikely (is_vm_hugetlb_page (vma))) ret =hugetlb_fault (vma->vm_mm, vma, address, flags);else
mm/swapfile.c +2 -1
@@ -2903,7 +2903,8 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags) p->flags =0 ;spin_unlock (&swap_lock);vfree (swap_map); -vfree (cluster_info); +kvfree (cluster_info); +kvfree (frontswap_map);if (swap_file) {if (inode &&S_ISREG (inode->i_mode)) {inode_unlock (inode);
net/bluetooth/l2cap_core.c +43 -37
304 lines not on this page · raw message
sound/isa/msnd/msnd_midi.c +15 -15
@@ -120,24 +120,24 @@ void snd_msndmidi_input_read(void *mpuv)unsigned long flags;struct snd_msndmidi *mpu = mpuv;void *pwMIDQData = mpu->dev->mappedbase +MIDQ_DATA_BUFF ; +u16 head, tail, size;spin_lock_irqsave (&mpu->input_lock, flags); -while (readw (mpu->dev->MIDQ + JQS_wTail) != -readw (mpu->dev->MIDQ + JQS_wHead)) { -u16 wTmp, val; - val =readw (pwMIDQData +2 *readw (mpu->dev->MIDQ + JQS_wHead)); - -if (test_bit (MSNDMIDI_MODE_BIT_INPUT_TRIGGER , - &mpu->mode)) -snd_rawmidi_receive (mpu->substream_input, - (unsigned char *)&val,1 ); - - wTmp =readw (mpu->dev->MIDQ + JQS_wHead) +1 ; -if (wTmp >readw (mpu->dev->MIDQ + JQS_wSize)) -writew (0 , mpu->dev->MIDQ + JQS_wHead); -else -writew (wTmp, mpu->dev->MIDQ + JQS_wHead); + head =readw (mpu->dev->MIDQ + JQS_wHead); + tail =readw (mpu->dev->MIDQ + JQS_wTail); + size =readw (mpu->dev->MIDQ + JQS_wSize); +if (head > size || tail > size) + goto out; +while (head != tail) { +unsigned char val =readw (pwMIDQData +2 * head); + +if (test_bit (MSNDMIDI_MODE_BIT_INPUT_TRIGGER , &mpu->mode)) +snd_rawmidi_receive (mpu->substream_input, &val,1 ); +if (++head > size) + head =0 ; +writew (head, mpu->dev->MIDQ + JQS_wHead); } + out:spin_unlock_irqrestore (&mpu->input_lock, flags); }EXPORT_SYMBOL (snd_msndmidi_input_read);
sound/isa/msnd/msnd_pinnacle.c +12 -11
@@ -170,23 +170,24 @@ static irqreturn_t snd_msnd_interrupt(int irq, void *dev_id) {struct snd_msnd *chip = dev_id;void *pwDSPQData = chip->mappedbase +DSPQ_DATA_BUFF ; +u16 head, tail, size;/* Send ack to DSP */ /* inb(chip->io + HP_RXL); */ /* Evaluate queued DSP messages */ -while (readw (chip->DSPQ + JQS_wTail) !=readw (chip->DSPQ + JQS_wHead)) { -u16 wTmp; - -snd_msnd_eval_dsp_msg (chip, -readw (pwDSPQData +2 *readw (chip->DSPQ + JQS_wHead))); - - wTmp =readw (chip->DSPQ + JQS_wHead) +1 ; -if (wTmp >readw (chip->DSPQ + JQS_wSize)) -writew (0 , chip->DSPQ + JQS_wHead); -else -writew (wTmp, chip->DSPQ + JQS_wHead); + head =readw (chip->DSPQ + JQS_wHead); + tail =readw (chip->DSPQ + JQS_wTail); + size =readw (chip->DSPQ + JQS_wSize); +if (head > size || tail > size) + goto out; +while (head != tail) { +snd_msnd_eval_dsp_msg (chip,readw (pwDSPQData +2 * head)); +if (++head > size) + head =0 ; +writew (head, chip->DSPQ + JQS_wHead); } + out:/* Send ack to DSP */ inb (chip->io +HP_RXL );return IRQ_HANDLED ;
tools/testing/selftests/x86/fsgsbase.c +35 -6
76 lines not on this page · raw message