Linux 4.9.150
Greg KH
maintainerI'm announcing the release of the 4.9.150 kernel.
All users of the 4.9 kernel series must upgrade.
The updated 4.9.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.9.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/imx7d-nitrogen7.dts | 9 arch/arm/mach-imx/cpuidle-imx6sx.c | 2 arch/mips/kernel/vdso.c | 4 arch/mips/math-emu/dsemul.c | 38 +- arch/powerpc/boot/crt0.S | 4 arch/powerpc/kernel/signal_32.c | 20 + arch/powerpc/kernel/signal_64.c | 44 ++- arch/x86/crypto/chacha20_glue.c | 1 drivers/gpu/drm/vc4/vc4_plane.c | 1 drivers/hwtracing/intel_th/msu.c | 3 drivers/infiniband/hw/hfi1/verbs.c | 2 drivers/infiniband/sw/rxe/rxe_resp.c | 13 - drivers/input/keyboard/omap4-keypad.c | 16 - drivers/iommu/intel-iommu.c | 4 drivers/misc/genwqe/card_utils.c | 2 drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 3 drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 1 drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 54 +++- drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h | 4 drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c | 3 drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c | 14 - drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 15 + drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 246 +++++++++---------- drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h | 13 - drivers/net/ethernet/hisilicon/hns/hns_enet.c | 43 +++ drivers/net/ethernet/neterion/vxge/vxge-config.c | 2 drivers/net/ethernet/nuvoton/w90p910_ether.c | 2 drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c | 3 drivers/net/usb/lan78xx.c | 4 drivers/net/wireless/broadcom/b43/phy_common.c | 2 drivers/pinctrl/meson/pinctrl-meson.c | 3 drivers/power/supply/olpc_battery.c | 4 drivers/s390/scsi/zfcp_aux.c | 6 drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 2 drivers/target/iscsi/cxgbit/cxgbit_cm.c | 5 drivers/target/iscsi/cxgbit/cxgbit_main.c | 1 drivers/tty/serial/sunsu.c | 31 ++ drivers/vhost/vsock.c | 2 fs/ceph/caps.c | 1 fs/dlm/lock.c | 17 - fs/dlm/lockspace.c | 2 fs/gfs2/inode.c | 18 - fs/gfs2/rgrp.c | 2 include/uapi/linux/input-event-codes.h | 9 kernel/fork.c | 13 - kernel/memremap.c | 11 mm/memory_hotplug.c | 16 + net/9p/client.c | 21 + net/ceph/auth_x.c | 2 net/netfilter/ipset/ip_set_list_set.c | 2 net/netfilter/nf_conntrack_seqadj.c | 7 net/sunrpc/auth_gss/svcauth_gss.c | 8 net/sunrpc/cache.c | 10 net/sunrpc/xprtsock.c | 4 net/xfrm/xfrm_state.c | 2 scripts/checkstack.pl | 4 sound/pci/cs46xx/dsp_spos.c | 3 sound/usb/mixer.c | 10 sound/usb/quirks-table.h | 3 tools/testing/nvdimm/test/iomap.c | 2 61 files changed, 522 insertions(+), 273 deletions(-)
Alexander Shishkin (1):
intel_th: msu: Fix an off-by-one in attribute store
Andreas Gruenbacher (2):
gfs2: Get rid of potential double-freeing in gfs2_create_inode
gfs2: Fix loop in gfs2_rbm_find
Anson Huang (1):
ARM: imx: update the cpu power up timing setting on i.mx6sx
Arnd Bergmann (1):
w90p910_ether: remove incorrect __init annotation
Benjamin Poirier (1):
xfrm: Fix bucket count reported to userspace
Boris Brezillon (1):
drm/vc4: Set ->is_yuv to false when num_planes == 1
Breno Leitao (1):
powerpc/tm: Set MSR[TS] just prior to recheckpoint
Christian Borntraeger (1):
genwqe: Fix size check
Colin Ian King (1):
vxge: ensure data0 is initialized in when fetching firmware version information
Dan Carpenter (2):
scsi: bnx2fc: Fix NULL dereference in error handling
ALSA: cs46xx: Potential NULL dereference in probe
Dan Williams (2):
mm, devm_memremap_pages: mark devm_memremap_pages() EXPORT_SYMBOL_GPL mm, devm_memremap_pages: kill mapping "System RAM" support
David Herrmann (1):
fork: record start_time late
Dominique Martinet (1):
9p/net: put a lower bound on msize
Eric Biggers (1):
crypto: x86/chacha20 - avoid sleeping with preemption disabled
Fabio Estevam (1):
ARM: dts: imx7d-nitrogen7: Fix the description of the Wifi clock
Florian Westphal (1):
netfilter: seqadj: re-load tcp header pointer after possible head reallocation
Greg Kroah-Hartman (1):
Linux 4.9.150
Hui Peng (1):
ALSA: usb-audio: Fix an out-of-bound read in create_composite_quirks
Ilya Dryomov (1):
libceph: fix CEPH_FEATURE_CEPHX_V2 check in calc_signature()
Ivan Mironov (1):
bnx2x: Fix NULL pointer dereference in bnx2x_del_all_vlans() on some hw
Jason Martinsen (1):
lan78xx: Resolve issue with changing MAC address
Jerome Brunet (1):
pinctrl: meson: fix pull enable register calculation
Kangjie Lu (1):
net: netxen: fix a missing check and an uninitialized use
Larry Finger (1):
b43: Fix error in cordic routine
Lubomir Rintel (1):
power: supply: olpc_battery: correct the temperature units
Michael J. Ruhl (1):
IB/hfi1: Incorrect sizing of sge for PIO will OOPs
Michal Hocko (1):
hwpoison, memory_hotplug: allow hwpoisoned pages to be offlined
Nathan Chancellor (1):
drivers: net: xgene: Remove unnecessary forward declarations
Pan Bian (1):
netfilter: ipset: do not call ipset_nest_end after nla_nest_cancel
Paul Burton (1):
MIPS: math-emu: Write-protect delay slot emulation pages
Paul Mackerras (1):
powerpc: Fix COFF zImage booting on old powermacs
Peter Hutterer (1):
Input: restore EV_ABS ABS_RESERVED
Qian Cai (1):
checkstack.pl: fix for aarch64
Sagi Grimberg (1):
rxe: fix error completion wr_id and qp_num
Sohil Mehta (1):
iommu/vt-d: Handle domain agaw being less than iommu agaw
Stefan Hajnoczi (1):
vhost/vsock: fix uninitialized vhost_vsock->guest_cid
Steffen Maier (1):
scsi: zfcp: fix posting too many status read buffers leading to adapter shutdown
Sudarsana Reddy Kalluru (3):
bnx2x: Clear fip MAC when fcoe offload support is disabled
bnx2x: Remove configured vlans as part of unload sequence.
bnx2x: Send update-svid ramrod with retry/poll flags enabled
Takashi Iwai (1):
ALSA: usb-audio: Avoid access before bLength check in build_audio_procunit()
Tony Lindgren (1):
Input: omap-keypad - fix idle configuration to not block SoC idle states
Trond Myklebust (1):
SUNRPC: Fix a race with XPRT_CONNECTING
Varun Prakash (2):
scsi: target: iscsi: cxgbit: fix csk leak
scsi: target: iscsi: cxgbit: add missing spin_lock_init()
Vasily Averin (6):
sunrpc: fix cache_head leak due to queued request
sunrpc: use SVC_NET() in svcauth_gss_* functions
dlm: fixed memory leaks after failed ls_remove_names allocation
dlm: possible memory leak on error path in create_lkb()
dlm: lost put_lkb on error path in receive_convert() and receive_unlock()
dlm: memory leaks on error path in dlm_user_request()
Yan, Zheng (1):
ceph: don't update importing cap's mseq when handing cap export
Yangtao Li (1):
serial/sunsu: fix refcount leak
Yonglong Liu (9):
net: hns: Incorrect offset address used for some registers.
net: hns: All ports can not work when insmod hns ko after rmmod.
net: hns: Some registers use wrong address according to the datasheet.
net: hns: Fixed bug that netdev was opened twice
net: hns: Clean rx fbd when ae stopped.
net: hns: Free irq when exit from abnormal branch
net: hns: Avoid net reset caused by pause frames storm
net: hns: Fix ntuple-filters status error.
net: hns: Add mac pcs config when enable|disable mac
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 9 -SUBLEVEL = 149 +SUBLEVEL = 150 EXTRAVERSION = NAME = Roaring Lionus
arch/arm/boot/dts/imx7d-nitrogen7.dts +7 -2
@@ -117,13 +117,17 @@ compatible = "regulator-fixed"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; - clocks = <&clks IMX7D_CLKO2_ROOT_DIV>; - clock-names = "slow"; regulator-name = "reg_wlan"; startup-delay-us = <70000>; gpio = <&gpio4 21 GPIO_ACTIVE_HIGH>; enable-active-high; }; + + usdhc2_pwrseq: usdhc2_pwrseq { + compatible = "mmc-pwrseq-simple"; + clocks = <&clks IMX7D_CLKO2_ROOT_DIV>; + clock-names = "ext_clock"; + }; }; &adc1 {
@@ -430,6 +434,7 @@ bus-width = <4>; non-removable; vmmc-supply = <®_wlan>; + mmc-pwrseq = <&usdhc2_pwrseq>; cap-power-off-card; keep-power-in-suspend; status = "okay";
arch/arm/mach-imx/cpuidle-imx6sx.c +1 -1
@@ -108,7 +108,7 @@ int __init imx6sx_cpuidle_init(void)* except for power up sw2iso which need to be * larger than LDO ramp up time. */ -imx_gpc_set_arm_power_up_timing (2 ,1 ); +imx_gpc_set_arm_power_up_timing (0xf ,1 );imx_gpc_set_arm_power_down_timing (1 ,1 );return cpuidle_register (&imx6sx_cpuidle_driver,NULL );
arch/mips/kernel/vdso.c +2 -2
@@ -111,8 +111,8 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)/* Map delay slot emulation page */ base =mmap_region (NULL ,STACK_TOP ,PAGE_SIZE , -VM_READ |VM_WRITE |VM_EXEC | -VM_MAYREAD |VM_MAYWRITE |VM_MAYEXEC , +VM_READ |VM_EXEC | +VM_MAYREAD |VM_MAYWRITE |VM_MAYEXEC ,0 );if (IS_ERR_VALUE (base)) { ret = base;
arch/mips/math-emu/dsemul.c +20 -18
@@ -211,8 +211,9 @@ int mips_dsemul(struct pt_regs *regs, mips_instruction ir, {int isa16 =get_isa16_mode (regs->cp0_epc);mips_instruction break_math; -struct emuframe __user *fr; -int err, fr_idx; +unsigned long fr_uaddr; +struct emuframe fr; +int fr_idx, ret;/* NOP is easy */ if (ir ==0 )
@@ -247,27 +248,31 @@ int mips_dsemul(struct pt_regs *regs, mips_instruction ir, fr_idx =alloc_emuframe ();if (fr_idx ==BD_EMUFRAME_NONE )return SIGBUS ; - fr = &dsemul_page ()[fr_idx];/* Retrieve the appropriately encoded break instruction */ break_math =BREAK_MATH (isa16);/* Write the instructions to the frame */ if (isa16) { - err =__put_user (ir >>16 , - (u16 __user *)(&fr->emul)); - err |=__put_user (ir &0xffff , - (u16 __user *)((long )(&fr->emul) +2 )); - err |=__put_user (break_math >>16 , - (u16 __user *)(&fr->badinst)); - err |=__put_user (break_math &0xffff , - (u16 __user *)((long )(&fr->badinst) +2 )); +union mips_instruction _emul = { + .halfword = { ir >>16 , ir } + }; +union mips_instruction _badinst = { + .halfword = { break_math >>16 , break_math } + }; + + fr.emul = _emul.word; + fr.badinst = _badinst.word; }else { - err =__put_user (ir, &fr->emul); - err |=__put_user (break_math, &fr->badinst); + fr.emul = ir; + fr.badinst = break_math; } -if (unlikely (err)) { +/* Write the frame to user memory */ + fr_uaddr = (unsigned long )&dsemul_page ()[fr_idx]; + ret =access_process_vm (current, fr_uaddr, &fr,sizeof (fr), +FOLL_FORCE |FOLL_WRITE ); +if (unlikely (ret !=sizeof (fr))) {MIPS_FPU_EMU_INC_STATS (errors);free_emuframe (fr_idx, current->mm);return SIGBUS ;
@@ -279,10 +284,7 @@ int mips_dsemul(struct pt_regs *regs, mips_instruction ir,atomic_set (¤t->thread.bd_emu_frame, fr_idx);/* Change user register context to execute the frame */ - regs->cp0_epc = (unsigned long )&fr->emul | isa16; - -/* Ensure the icache observes our newly written frame */ -flush_cache_sigtramp ((unsigned long )&fr->emul); + regs->cp0_epc = fr_uaddr | isa16;return 0 ; }
arch/powerpc/boot/crt0.S +3 -1
@@ -15,7 +15,7 @@ RELA = 7 RELACOUNT = 0x6ffffff9 - .text + .data /* A procedure descriptor used when booting this as a COFF file. * When making COFF, this comes first in the link and we're * linked at 0x500000.
@@ -23,6 +23,8 @@ RELACOUNT = 0x6ffffff9 .globl _zimage_start_opd _zimage_start_opd: .long 0x500000, 0, 0, 0 + .text + b _zimage_start #ifdef __powerpc64__ .balign 8
arch/powerpc/kernel/signal_32.c +19 -1
@@ -866,7 +866,23 @@ static long restore_tm_user_regs(struct pt_regs *regs,/* If TM bits are set to the reserved value, it's an invalid context */ if (MSR_TM_RESV (msr_hi))return 1 ; -/* Pull in the MSR TM bits from the user context */ + +/* +* Disabling preemption, since it is unsafe to be preempted +* with MSR[TS] set without recheckpointing. +*/ +preempt_disable (); + +/* +* CAUTION: +* After regs->MSR[TS] being updated, make sure that get_user(), +* put_user() or similar functions are *not* called. These +* functions can generate page faults which will cause the process +* to be de-scheduled with MSR[TS] set but without calling +* tm_recheckpoint(). This can cause a bug. +* +* Pull in the MSR TM bits from the user context +*/ regs->msr = (regs->msr & ~MSR_TS_MASK ) | (msr_hi &MSR_TS_MASK );/* Now, recheckpoint. This loads up all of the checkpointed (older) * registers, including FP and V[S]Rs. After recheckpointing, the
@@ -891,6 +907,8 @@ static long restore_tm_user_regs(struct pt_regs *regs, }#endif +preempt_enable (); +return 0 ; }#endif
arch/powerpc/kernel/signal_64.c +30 -14
62 lines not on this page · raw message
arch/x86/crypto/chacha20_glue.c +1 -0
@@ -77,6 +77,7 @@ static int chacha20_simd(struct blkcipher_desc *desc, struct scatterlist *dst,blkcipher_walk_init (&walk, dst, src, nbytes); err =blkcipher_walk_virt_block (desc, &walk,CHACHA20_BLOCK_SIZE ); + desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP ;crypto_chacha20_init (state,crypto_blkcipher_ctx (desc->tfm), walk.iv);
drivers/gpu/drm/vc4/vc4_plane.c +1 -0
@@ -352,6 +352,7 @@ static int vc4_plane_setup_clipping_and_scaling(struct drm_plane_state *state)if (vc4_state->is_unity) vc4_state->x_scaling[0 ] =VC4_SCALING_PPF ; }else { + vc4_state->is_yuv = false; vc4_state->x_scaling[1 ] =VC4_SCALING_NONE ; vc4_state->y_scaling[1 ] =VC4_SCALING_NONE ; }
drivers/hwtracing/intel_th/msu.c +2 -1
@@ -1429,7 +1429,8 @@ nr_pages_store(struct device *dev, struct device_attribute *attr,if (!end)break ; - len -= end - p; +/* consume the number and the following comma, hence +1 */ + len -= end - p +1 ; p = end +1 ; }while (len);
drivers/infiniband/hw/hfi1/verbs.c +2 -0
@@ -1088,6 +1088,8 @@ int hfi1_verbs_send_pio(struct rvt_qp *qp, struct hfi1_pkt_state *ps,if (slen > len) slen = len; +if (slen > ss->sge.sge_length) + slen = ss->sge.sge_length;update_sge (ss, slen);seg_pio_copy_mid (pbuf, addr, slen); len -= slen;
drivers/infiniband/sw/rxe/rxe_resp.c +9 -4
@@ -826,11 +826,16 @@ static enum resp_states do_complete(struct rxe_qp *qp,memset (&cqe,0 ,sizeof (cqe)); - wc->wr_id = wqe->wr_id; - wc->status = qp->resp.status; - wc->qp = &qp->ibqp; +if (qp->rcq->is_user) { + uwc->status = qp->resp.status; + uwc->qp_num = qp->ibqp.qp_num; + uwc->wr_id = wqe->wr_id; + }else { + wc->status = qp->resp.status; + wc->qp = &qp->ibqp; + wc->wr_id = wqe->wr_id; + } -/* fields after status are not required for errors */ if (wc->status ==IB_WC_SUCCESS ) { wc->opcode = (pkt->mask &RXE_IMMDT_MASK && pkt->mask & RXE_WRITE_MASK) ?
drivers/input/keyboard/omap4-keypad.c +4 -12
@@ -126,12 +126,8 @@ static irqreturn_t omap4_keypad_irq_handler(int irq, void *dev_id) {struct omap4_keypad *keypad_data = dev_id; -if (kbd_read_irqreg (keypad_data,OMAP4_KBD_IRQSTATUS )) { -/* Disable interrupts */ -kbd_write_irqreg (keypad_data,OMAP4_KBD_IRQENABLE , -OMAP4_VAL_IRQDISABLE ); +if (kbd_read_irqreg (keypad_data,OMAP4_KBD_IRQSTATUS ))return IRQ_WAKE_THREAD ; - }return IRQ_NONE ; }
@@ -173,11 +169,6 @@ static irqreturn_t omap4_keypad_irq_thread_fn(int irq, void *dev_id)kbd_write_irqreg (keypad_data,OMAP4_KBD_IRQSTATUS ,kbd_read_irqreg (keypad_data,OMAP4_KBD_IRQSTATUS )); -/* enable interrupts */ -kbd_write_irqreg (keypad_data,OMAP4_KBD_IRQENABLE , -OMAP4_DEF_IRQENABLE_EVENTEN | -OMAP4_DEF_IRQENABLE_LONGKEY ); -return IRQ_HANDLED ; }
@@ -214,9 +205,10 @@ static void omap4_keypad_close(struct input_dev *input)disable_irq (keypad_data->irq); -/* Disable interrupts */ +/* Disable interrupts and wake-up events */ kbd_write_irqreg (keypad_data,OMAP4_KBD_IRQENABLE ,OMAP4_VAL_IRQDISABLE ); +kbd_writel (keypad_data,OMAP4_KBD_WAKEUPENABLE ,0 );/* clear pending interrupts */ kbd_write_irqreg(keypad_data, OMAP4_KBD_IRQSTATUS,
@@ -364,7 +356,7 @@ static int omap4_keypad_probe(struct platform_device *pdev) } error =request_threaded_irq (keypad_data->irq, omap4_keypad_irq_handler, - omap4_keypad_irq_thread_fn,0 , + omap4_keypad_irq_thread_fn,IRQF_ONESHOT ,"omap4-keypad" , keypad_data);if (error) {dev_err (&pdev->dev,"failed to register interrupt\n" );
drivers/iommu/intel-iommu.c +2 -2
@@ -2084,7 +2084,7 @@ static int domain_context_mapping_one(struct dmar_domain *domain,* than default. Unnecessary for PT mode. */ if (translation !=CONTEXT_TT_PASS_THROUGH ) { -for (agaw = domain->agaw; agaw != iommu->agaw; agaw--) { +for (agaw = domain->agaw; agaw > iommu->agaw; agaw--) { ret = -ENOMEM ; pgd =phys_to_virt (dma_pte_addr (pgd));if (!dma_pte_present (pgd))
@@ -2098,7 +2098,7 @@ static int domain_context_mapping_one(struct dmar_domain *domain, translation =CONTEXT_TT_MULTI_LEVEL ;context_set_address_root (context,virt_to_phys (pgd)); -context_set_address_width (context, iommu->agaw); +context_set_address_width (context, agaw); }else {/* * In pass through mode, AW must be programmed to
drivers/misc/genwqe/card_utils.c +1 -1
@@ -217,7 +217,7 @@ u32 genwqe_crc32(u8 *buff, size_t len, u32 init)void *__genwqe_alloc_consistent (struct genwqe_dev *cd,size_t size,dma_addr_t *dma_handle) { -if (get_order (size) >MAX_ORDER ) +if (get_order (size) >=MAX_ORDER )return NULL ; return dma_zalloc_coherent(&cd->pci_dev->dev, size, dma_handle,
drivers/net/ethernet/apm/xgene/xgene_enet_main.c +0 -3
@@ -29,9 +29,6 @@#define RES_RING_CSR 1#define RES_RING_CMD 2 -static const struct of_device_id xgene_enet_of_match[]; -static const struct acpi_device_id xgene_enet_acpi_match[]; -static void xgene_enet_init_bufpool (struct xgene_enet_desc_ring *buf_pool) {struct xgene_enet_raw_desc16 *raw_desc;
drivers/net/ethernet/broadcom/bnx2x/bnx2x.h +1 -0
@@ -1278,6 +1278,7 @@ enum sp_rtnl_flag {BNX2X_SP_RTNL_TX_STOP ,BNX2X_SP_RTNL_GET_DRV_VERSION ,BNX2X_SP_RTNL_CHANGE_UDP_PORT , + BNX2X_SP_RTNL_UPDATE_SVID, }; enum bnx2x_iov_flag {
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +45 -9
103 lines not on this page · raw message
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h +3 -1
@@ -265,6 +265,7 @@ enum {BNX2X_ETH_MAC ,BNX2X_ISCSI_ETH_MAC ,BNX2X_NETQ_ETH_MAC , +BNX2X_VLAN ,BNX2X_DONT_CONSUME_CAM_CREDIT , BNX2X_DONT_CONSUME_CAM_CREDIT_DEST, };
@@ -272,7 +273,8 @@ enum {#define BNX2X_VLAN_MAC_CMP_MASK (1 << BNX2X_UC_LIST_MAC | \ 1 << BNX2X_ETH_MAC | \ 1 << BNX2X_ISCSI_ETH_MAC | \ - 1 << BNX2X_NETQ_ETH_MAC) + 1 << BNX2X_NETQ_ETH_MAC | \ + 1 << BNX2X_VLAN)#define BNX2X_VLAN_MAC_CMP_FLAGS (flags) \ ((flags) & BNX2X_VLAN_MAC_CMP_MASK)
drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c +3 -0
@@ -290,6 +290,9 @@ void hns_ae_stop(struct hnae_handle *handle)hns_ae_ring_enable_all (handle,0 ); +/* clean rx fbd. */ +hns_rcb_wait_fbd_clean (handle->qs, handle->q_num,RCB_INT_FLAG_RX ); + (void )hns_mac_vm_config_bc_en (mac_cb,0 , false); }
drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c +10 -4
@@ -67,11 +67,14 @@ static void hns_gmac_enable(void *mac_drv, enum mac_commom_mode mode)struct mac_driver *drv = (struct mac_driver *)mac_drv;/*enable GE rX/tX */ -if ((mode ==MAC_COMM_MODE_TX ) || (mode ==MAC_COMM_MODE_RX_AND_TX )) +if (mode ==MAC_COMM_MODE_TX || mode ==MAC_COMM_MODE_RX_AND_TX )dsaf_set_dev_bit (drv,GMAC_PORT_EN_REG ,GMAC_PORT_TX_EN_B ,1 ); -if ((mode ==MAC_COMM_MODE_RX ) || (mode ==MAC_COMM_MODE_RX_AND_TX )) +if (mode ==MAC_COMM_MODE_RX || mode ==MAC_COMM_MODE_RX_AND_TX ) { +/* enable rx pcs */ +dsaf_set_dev_bit (drv,GMAC_PCS_RX_EN_REG ,0 ,0 );dsaf_set_dev_bit (drv,GMAC_PORT_EN_REG ,GMAC_PORT_RX_EN_B ,1 ); + } }static void hns_gmac_disable (void *mac_drv,enum mac_commom_mode mode)
@@ -79,11 +82,14 @@ static void hns_gmac_disable(void *mac_drv, enum mac_commom_mode mode)struct mac_driver *drv = (struct mac_driver *)mac_drv;/*disable GE rX/tX */ -if ((mode ==MAC_COMM_MODE_TX ) || (mode ==MAC_COMM_MODE_RX_AND_TX )) +if (mode ==MAC_COMM_MODE_TX || mode ==MAC_COMM_MODE_RX_AND_TX )dsaf_set_dev_bit (drv,GMAC_PORT_EN_REG ,GMAC_PORT_TX_EN_B ,0 ); -if ((mode ==MAC_COMM_MODE_RX ) || (mode ==MAC_COMM_MODE_RX_AND_TX )) +if (mode ==MAC_COMM_MODE_RX || mode ==MAC_COMM_MODE_RX_AND_TX ) { +/* disable rx pcs */ +dsaf_set_dev_bit (drv,GMAC_PCS_RX_EN_REG ,0 ,1 );dsaf_set_dev_bit (drv,GMAC_PORT_EN_REG ,GMAC_PORT_RX_EN_B ,0 ); + } }/* hns_gmac_get_en - get port enable
drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c +15 -0
@@ -724,6 +724,17 @@ static void hns_mac_register_phy(struct hns_mac_cb *mac_cb) mac_cb->mac_id, addr); } +static void hns_mac_remove_phydev (struct hns_mac_cb *mac_cb) +{ +if (!to_acpi_device_node (mac_cb->fw_port) || !mac_cb->phy_dev) +return ; + +phy_device_remove (mac_cb->phy_dev); +phy_device_free (mac_cb->phy_dev); + + mac_cb->phy_dev =NULL ; +} +#define MAC_MEDIA_TYPE_MAX_LEN 16 static const struct {
@@ -1030,7 +1041,11 @@ void hns_mac_uninit(struct dsaf_device *dsaf_dev)int max_port_num =hns_mac_get_max_port_num (dsaf_dev);for (i =0 ; i < max_port_num; i++) { +if (!dsaf_dev->mac_cb[i]) +continue ; + dsaf_dev->misc_op->cpld_reset_led (dsaf_dev->mac_cb[i]); +hns_mac_remove_phydev (dsaf_dev->mac_cb[i]); dsaf_dev->mac_cb[i] =NULL ; } }
drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c +123 -123
369 lines not on this page · raw message
drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h +7 -6
@@ -173,7 +173,7 @@#define DSAF_INODE_IN_DATA_STP_DISC_0_REG 0x1A50#define DSAF_INODE_GE_FC_EN_0_REG 0x1B00#define DSAF_INODE_VC0_IN_PKT_NUM_0_REG 0x1B50 -#define DSAF_INODE_VC1_IN_PKT_NUM_0_REG 0x1C00 +#define DSAF_INODE_VC1_IN_PKT_NUM_0_REG 0x103C#define DSAF_INODE_IN_PRIO_PAUSE_BASE_REG 0x1C00#define DSAF_INODE_IN_PRIO_PAUSE_BASE_OFFSET 0x100#define DSAF_INODE_IN_PRIO_PAUSE_OFFSET 0x50
@@ -400,11 +400,11 @@#define RCB_ECC_ERR_ADDR4_REG 0x460#define RCB_ECC_ERR_ADDR5_REG 0x464 -#define RCB_COM_SF_CFG_INTMASK_RING 0x480 -#define RCB_COM_SF_CFG_RING_STS 0x484 -#define RCB_COM_SF_CFG_RING 0x488 -#define RCB_COM_SF_CFG_INTMASK_BD 0x48C -#define RCB_COM_SF_CFG_BD_RINT_STS 0x470 +#define RCB_COM_SF_CFG_INTMASK_RING 0x470 +#define RCB_COM_SF_CFG_RING_STS 0x474 +#define RCB_COM_SF_CFG_RING 0x478 +#define RCB_COM_SF_CFG_INTMASK_BD 0x47C +#define RCB_COM_SF_CFG_BD_RINT_STS 0x480#define RCB_COM_RCB_RD_BD_BUSY 0x490#define RCB_COM_RCB_FBD_CRT_EN 0x494#define RCB_COM_AXI_WR_ERR_INTMASK 0x498
@@ -528,6 +528,7 @@#define GMAC_LD_LINK_COUNTER_REG 0x01D0UL#define GMAC_LOOP_REG 0x01DCUL#define GMAC_RECV_CONTROL_REG 0x01E0UL +#define GMAC_PCS_RX_EN_REG 0x01E4UL#define GMAC_VLAN_CODE_REG 0x01E8UL#define GMAC_RX_OVERRUN_CNT_REG 0x01ECUL#define GMAC_RX_LENGTHFIELD_ERR_CNT_REG 0x01F4UL
drivers/net/ethernet/hisilicon/hns/hns_enet.c +39 -4
105 lines not on this page · raw message
drivers/net/ethernet/neterion/vxge/vxge-config.c +1 -1
@@ -808,7 +808,7 @@ __vxge_hw_vpath_fw_ver_get(struct __vxge_hw_virtualpath *vpath,struct vxge_hw_device_date *fw_date = &hw_info->fw_date;struct vxge_hw_device_version *flash_version = &hw_info->flash_version;struct vxge_hw_device_date *flash_date = &hw_info->flash_date; -u64 data0, data1 =0 , steer_ctrl =0 ; +u64 data0 =0 , data1 =0 , steer_ctrl =0 ;enum vxge_hw_status status; status = vxge_hw_vpath_fw_api(vpath,
drivers/net/ethernet/nuvoton/w90p910_ether.c +1 -1
@@ -918,7 +918,7 @@ static const struct net_device_ops w90p910_ether_netdev_ops = { .ndo_change_mtu = eth_change_mtu, }; -static void __init get_mac_address (struct net_device *dev) +static void get_mac_address (struct net_device *dev) {struct w90p910_ether *ether =netdev_priv (dev);struct platform_device *pdev;
drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c +2 -1
@@ -1125,7 +1125,8 @@ netxen_validate_firmware(struct netxen_adapter *adapter)return -EINVAL ; } val =nx_get_bios_version (adapter); -netxen_rom_fast_read (adapter,NX_BIOS_VERSION_OFFSET , (int *)&bios); +if (netxen_rom_fast_read (adapter,NX_BIOS_VERSION_OFFSET , (int *)&bios)) +return -EIO ;if ((__force u32 )val != bios) {dev_err (&pdev->dev,"%s: firmware bios is incompatible\n" , fw_name[fw_type]);
drivers/net/usb/lan78xx.c +4 -0
@@ -2014,6 +2014,10 @@ static int lan78xx_set_mac_addr(struct net_device *netdev, void *p) ret =lan78xx_write_reg (dev,RX_ADDRL , addr_lo); ret =lan78xx_write_reg (dev,RX_ADDRH , addr_hi); +/* Added to support MAC address changes */ + ret =lan78xx_write_reg (dev,MAF_LO (0 ), addr_lo); + ret =lan78xx_write_reg (dev,MAF_HI (0 ), addr_hi |MAF_HI_VALID_ ); +return 0 ; }
drivers/net/wireless/broadcom/b43/phy_common.c +1 -1
@@ -616,7 +616,7 @@ struct b43_c32 b43_cordic(int theta)u8 i;s32 tmp;s8 signx =1 ; -u32 angle =0 ; +s32 angle =0 ;struct b43_c32 ret = { .i =39797 , .q =0 , };while (theta > (180 <<16 ))
drivers/pinctrl/meson/pinctrl-meson.c +2 -1
@@ -274,7 +274,8 @@ static int meson_pinconf_set(struct pinctrl_dev *pcdev, unsigned int pin,case PIN_CONFIG_BIAS_DISABLE :dev_dbg (pc->dev,"pin %u: disable bias\n" , pin); -meson_calc_reg_and_bit (bank, pin,REG_PULL , ®, &bit); +meson_calc_reg_and_bit (bank, pin,REG_PULLEN , ®, + &bit); ret =regmap_update_bits (pc->reg_pullen, reg,BIT (bit),0 );if (ret)
drivers/power/supply/olpc_battery.c +2 -2
@@ -427,14 +427,14 @@ static int olpc_bat_get_property(struct power_supply *psy,if (ret)return ret; - val->intval = (s16 )be16_to_cpu (ec_word) *100 /256 ; + val->intval = (s16 )be16_to_cpu (ec_word) *10 /256 ;break ;case POWER_SUPPLY_PROP_TEMP_AMBIENT : ret =olpc_ec_cmd (EC_AMB_TEMP ,NULL ,0 , (void *)&ec_word,2 );if (ret)return ret; - val->intval = (int )be16_to_cpu (ec_word) *100 /256 ; + val->intval = (int )be16_to_cpu (ec_word) *10 /256 ;break ;case POWER_SUPPLY_PROP_CHARGE_COUNTER : ret =olpc_ec_cmd (EC_BAT_ACR ,NULL ,0 , (void *)&ec_word,2 );
drivers/s390/scsi/zfcp_aux.c +3 -3
@@ -275,16 +275,16 @@ static void zfcp_free_low_mem_buffers(struct zfcp_adapter *adapter)*/ int zfcp_status_read_refill (struct zfcp_adapter *adapter) { -while (atomic_read (&adapter->stat_miss) >0 ) +while (atomic_add_unless (&adapter->stat_miss,-1 ,0 ))if (zfcp_fsf_status_read (adapter->qdio)) { +atomic_inc (&adapter->stat_miss);/* undo add -1 */ if (atomic_read (&adapter->stat_miss) >= adapter->stat_read_buf_num) {zfcp_erp_adapter_reopen (adapter,0 ,"axsref1" );return 1 ; }break ; - }else -atomic_dec (&adapter->stat_miss); + }return 0 ; }
drivers/scsi/bnx2fc/bnx2fc_fcoe.c +1 -1
@@ -2331,7 +2331,7 @@ static int _bnx2fc_create(struct net_device *netdev,if (!interface) { printk(KERN_ERR PFX "bnx2fc_interface_create failed\n"); rc = -ENOMEM ; - goto ifput_err; + goto netdev_err; }if (netdev->priv_flags &IFF_802_1Q_VLAN ) {
drivers/target/iscsi/cxgbit/cxgbit_cm.c +4 -1
@@ -631,8 +631,11 @@ static void cxgbit_send_halfclose(struct cxgbit_sock *csk)static void cxgbit_arp_failure_discard (void *handle,struct sk_buff *skb) { +struct cxgbit_sock *csk = handle; +pr_debug ("%s cxgbit_device %p\n" , __func__, handle);kfree_skb (skb); +cxgbit_put_csk (csk); }static void cxgbit_abort_arp_failure (void *handle,struct sk_buff *skb)
@@ -1136,7 +1139,7 @@ cxgbit_pass_accept_rpl(struct cxgbit_sock *csk, struct cpl_pass_accept_req *req) rpl5->opt0 =cpu_to_be64 (opt0); rpl5->opt2 =cpu_to_be32 (opt2);set_wr_txq (skb,CPL_PRIORITY_SETUP , csk->ctrlq_idx); -t4_set_arp_err_handler (skb,NULL , cxgbit_arp_failure_discard); +t4_set_arp_err_handler (skb, csk, cxgbit_arp_failure_discard);cxgbit_l2t_send (csk->com.cdev, skb, csk->l2t); }
drivers/target/iscsi/cxgbit/cxgbit_main.c +1 -0
@@ -58,6 +58,7 @@ static void *cxgbit_uld_add(const struct cxgb4_lld_info *lldi)return ERR_PTR (-ENOMEM );kref_init (&cdev->kref); +spin_lock_init (&cdev->np_lock); cdev->lldi = *lldi;
drivers/tty/serial/sunsu.c +26 -5
@@ -1393,22 +1393,43 @@ static inline struct console *SUNSU_CONSOLE(void)static enum su_type su_get_type (struct device_node *dp) {struct device_node *ap =of_find_node_by_path ("/aliases" ); +enum su_type rc =SU_PORT_PORT ;if (ap) {const char *keyb =of_get_property (ap,"keyboard" ,NULL );const char *ms =of_get_property (ap,"mouse" ,NULL ); +struct device_node *match;if (keyb) { -if (dp ==of_find_node_by_path (keyb)) -return SU_PORT_KBD ; + match =of_find_node_by_path (keyb); + +/* +* The pointer is used as an identifier not +* as a pointer, we can drop the refcount on +* the of__node immediately after getting it. +*/ +of_node_put (match); + +if (dp == match) { + rc =SU_PORT_KBD ; + goto out; + } }if (ms) { -if (dp ==of_find_node_by_path (ms)) -return SU_PORT_MS ; + match =of_find_node_by_path (ms); + +of_node_put (match); + +if (dp == match) { + rc =SU_PORT_MS ; + goto out; + } } } -return SU_PORT_PORT ; +out: +of_node_put (ap); +return rc; }static int su_probe (struct platform_device *op)
drivers/vhost/vsock.c +2 -0
@@ -520,6 +520,8 @@ static int vhost_vsock_dev_open(struct inode *inode, struct file *file) goto out; } + vsock->guest_cid =0 ;/* no CID assigned yet */ +atomic_set (&vsock->queued_replies,0 ); vqs[VSOCK_VQ_TX ] = &vsock->vqs[VSOCK_VQ_TX ];
fs/ceph/caps.c +0 -1
@@ -3343,7 +3343,6 @@ static void handle_cap_export(struct inode *inode, struct ceph_mds_caps *ex, tcap->cap_id = t_cap_id; tcap->seq = t_seq -1 ; tcap->issue_seq = t_seq -1 ; - tcap->mseq = t_mseq; tcap->issued |= issued; tcap->implemented |= issued;if (cap == ci->i_auth_cap)
fs/dlm/lock.c +10 -7
@@ -1210,6 +1210,7 @@ static int create_lkb(struct dlm_ls *ls, struct dlm_lkb **lkb_ret)if (rv <0 ) {log_error (ls,"create_lkb idr error %d" , rv); +dlm_free_lkb (lkb);return rv; }
@@ -4177,6 +4178,7 @@ static int receive_convert(struct dlm_ls *ls, struct dlm_message *ms) (unsigned long long )lkb->lkb_recover_seq, ms->m_header.h_nodeid, ms->m_lkid); error = -ENOENT ; +dlm_put_lkb (lkb); goto fail; }
@@ -4230,6 +4232,7 @@ static int receive_unlock(struct dlm_ls *ls, struct dlm_message *ms) lkb->lkb_id, lkb->lkb_remid, ms->m_header.h_nodeid, ms->m_lkid); error = -ENOENT ; +dlm_put_lkb (lkb); goto fail; }
@@ -5792,20 +5795,20 @@ int dlm_user_request(struct dlm_ls *ls, struct dlm_user_args *ua, goto out; } } - -/* After ua is attached to lkb it will be freed by dlm_free_lkb(). -When DLM_IFL_USER is set, the dlm knows that this is a userspace -lock and that lkb_astparam is the dlm_user_args structure. */ - error =set_lock_args (mode, &ua->lksb, flags, namelen, timeout_cs, fake_astfn, ua, fake_bastfn, &args); - lkb->lkb_flags |=DLM_IFL_USER ; -if (error) { +kfree (ua->lksb.sb_lvbptr); + ua->lksb.sb_lvbptr =NULL ; +kfree (ua);__put_lkb (ls, lkb); goto out; } +/* After ua is attached to lkb it will be freed by dlm_free_lkb(). +When DLM_IFL_USER is set, the dlm knows that this is a userspace +lock and that lkb_astparam is the dlm_user_args structure. */ + lkb->lkb_flags |=DLM_IFL_USER ; error =request_lock (ls, lkb, name, namelen, &args);switch (error) {
fs/dlm/lockspace.c +1 -1
@@ -673,11 +673,11 @@ static int new_lockspace(const char *name, const char *cluster,kfree (ls->ls_recover_buf); out_lkbidr:idr_destroy (&ls->ls_lkbidr); + out_rsbtbl:for (i =0 ; i <DLM_REMOVE_NAMES_MAX ; i++) {if (ls->ls_remove_names[i])kfree (ls->ls_remove_names[i]); } - out_rsbtbl:vfree (ls->ls_rsbtbl); out_lsfree:if (do_unreg)
fs/gfs2/inode.c +9 -9
@@ -740,17 +740,19 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry,the gfs2 structures. */ if (default_acl) { error =__gfs2_set_acl (inode, default_acl,ACL_TYPE_DEFAULT ); +if (error) + goto fail_gunlock3;posix_acl_release (default_acl); + default_acl =NULL ; }if (acl) { -if (!error) - error =__gfs2_set_acl (inode, acl,ACL_TYPE_ACCESS ); + error =__gfs2_set_acl (inode, acl,ACL_TYPE_ACCESS ); +if (error) + goto fail_gunlock3;posix_acl_release (acl); + acl =NULL ; } -if (error) - goto fail_gunlock3; - error =security_inode_init_security (&ip->i_inode, &dip->i_inode, name, &gfs2_initxattrs,NULL );if (error)
@@ -783,10 +785,8 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry,gfs2_glock_put (ip->i_gl);gfs2_rsqa_delete (ip,NULL ); fail_free_acls: -if (default_acl) -posix_acl_release (default_acl); -if (acl) -posix_acl_release (acl); +posix_acl_release (default_acl); +posix_acl_release (acl); fail_gunlock:gfs2_dir_no_add (&da);gfs2_glock_dq_uninit (ghs);
fs/gfs2/rgrp.c +1 -1
@@ -1705,9 +1705,9 @@ static int gfs2_rbm_find(struct gfs2_rbm *rbm, u8 state, u32 *minext, goto next_iter; }if (ret == -E2BIG ) { + n += rbm->bii - initial_bii; rbm->bii =0 ; rbm->offset =0 ; - n += (rbm->bii - initial_bii); goto res_covered_end_of_rgrp; }return ret;
include/uapi/linux/input-event-codes.h +9 -0
@@ -739,6 +739,15 @@#define ABS_MISC 0x28 +/* +* 0x2e is reserved and should not be used in input drivers. +* It was used by HID as ABS_MISC+6 and userspace needs to detect if +* the next ABS_* event is correct or is just ABS_MISC + n. +* We define here ABS_RESERVED so userspace can rely on it and detect +* the situation described above. +*/ +#define ABS_RESERVED 0x2e +#define ABS_MT_SLOT 0x2f/* MT slot being modified */ #define ABS_MT_TOUCH_MAJOR 0x30/* Major axis of touching ellipse */ #define ABS_MT_TOUCH_MINOR 0x31/* Minor axis (omit if circular) */
kernel/fork.c +11 -2
@@ -1606,8 +1606,6 @@ static __latent_entropy struct task_struct *copy_process(posix_cpu_timers_init (p); - p->start_time =ktime_get_ns (); - p->real_start_time =ktime_get_boot_ns (); p->io_context =NULL ; p->audit_context =NULL ;cgroup_fork (p);
@@ -1767,6 +1765,17 @@ static __latent_entropy struct task_struct *copy_process(if (retval) goto bad_fork_free_pid; +/* +* From this point on we must avoid any synchronous user-space +* communication until we take the tasklist-lock. In particular, we do +* not want user-space to be able to predict the process start-time by +* stalling fork(2) after we recorded the start_time but before it is +* visible to the system. +*/ + + p->start_time =ktime_get_ns (); + p->real_start_time =ktime_get_boot_ns (); +/* * Make it visible to the rest of the system, but dont wake it up yet. * Need tasklist lock for parent etc handling!
kernel/memremap.c +4 -7
@@ -305,15 +305,12 @@ void *devm_memremap_pages(struct device *dev, struct resource *res, is_ram =region_intersects (align_start, align_size,IORESOURCE_SYSTEM_RAM ,IORES_DESC_NONE ); -if (is_ram ==REGION_MIXED ) { -WARN_ONCE (1 ,"%s attempted on mixed region %pr\n" , - __func__, res); +if (is_ram !=REGION_DISJOINT ) { +WARN_ONCE (1 ,"%s attempted on %s region %pr\n" , __func__, + is_ram ==REGION_MIXED ?"mixed" :"ram" , res);return ERR_PTR (-ENXIO ); } -if (is_ram ==REGION_INTERSECTS ) -return __va (res->start); -if (!ref)return ERR_PTR (-EINVAL );
@@ -399,7 +396,7 @@ void *devm_memremap_pages(struct device *dev, struct resource *res,devres_free (page_map);return ERR_PTR (error); } -EXPORT_SYMBOL (devm_memremap_pages); +EXPORT_SYMBOL_GPL (devm_memremap_pages);unsigned long vmem_altmap_offset (struct vmem_altmap *altmap) {
mm/memory_hotplug.c +16 -0
@@ -34,6 +34,7 @@#include <linux/memblock.h> #include <linux/bootmem.h> #include <linux/compaction.h> +#include <linux/rmap.h> #include <asm/tlbflush.h>
@@ -1617,6 +1618,21 @@ do_migrate_range(unsigned long start_pfn, unsigned long end_pfn)continue ; } +/* +* HWPoison pages have elevated reference counts so the migration would +* fail on them. It also doesn't make any sense to migrate them in the +* first place. Still try to unmap such a page in case it is still mapped +* (e.g. current hwpoison implementation doesn't unmap KSM pages but keep +* the unmap as the catch all safety net). +*/ +if (PageHWPoison (page)) { +if (WARN_ON (PageLRU (page))) +isolate_lru_page (page); +if (page_mapped (page)) +try_to_unmap (page,TTU_IGNORE_MLOCK |TTU_IGNORE_ACCESS ); +continue ; + } +if (!get_page_unless_zero (page))continue ;/*
net/9p/client.c +21 -0
@@ -156,6 +156,12 @@ static int parse_opts(char *opts, struct p9_client *clnt) ret = r;continue ; } +if (option <4096 ) { +p9_debug (P9_DEBUG_ERROR , +"msize should be at least 4k\n" ); + ret = -EINVAL ; +continue ; + } clnt->msize = option;break ;case Opt_trans:
@@ -972,10 +978,18 @@ static int p9_client_version(struct p9_client *c)else if (!strncmp (version,"9P2000" ,6 )) c->proto_version = p9_proto_legacy;else { +p9_debug (P9_DEBUG_ERROR , +"server returned an unknown version: %s\n" , version); err = -EREMOTEIO ; goto error; } +if (msize <4096 ) { +p9_debug (P9_DEBUG_ERROR , +"server returned a msize < 4096: %d\n" , msize); + err = -EREMOTEIO ; + goto error; + }if (msize < c->msize) c->msize = msize;
@@ -1040,6 +1054,13 @@ struct p9_client *p9_client_create(const char *dev_name, char *options)if (clnt->msize > clnt->trans_mod->maxsize) clnt->msize = clnt->trans_mod->maxsize; +if (clnt->msize <4096 ) { +p9_debug (P9_DEBUG_ERROR , +"Please specify a msize of at least 4k\n" ); + err = -EINVAL ; + goto free_client; + } + err =p9_client_version (clnt);if (err) goto close_trans;
net/ceph/auth_x.c +1 -1
@@ -804,7 +804,7 @@ static int calc_signature(struct ceph_x_authorizer *au, struct ceph_msg *msg,void *enc_buf = au->enc_buf;int ret; -if (msg->con->peer_features &CEPH_FEATURE_CEPHX_V2 ) { +if (!(msg->con->peer_features &CEPH_FEATURE_CEPHX_V2 )) {struct {__le32 len;__le32 header_crc;
net/netfilter/ipset/ip_set_list_set.c +1 -1
@@ -518,8 +518,8 @@ list_set_list(const struct ip_set *set, ret = -EMSGSIZE ; }else { cb->args[IPSET_CB_ARG0 ] = i; +ipset_nest_end (skb, atd); } -ipset_nest_end (skb, atd); out:rcu_read_unlock ();return ret;
net/netfilter/nf_conntrack_seqadj.c +4 -3
@@ -115,12 +115,12 @@ static void nf_ct_sack_block_adjust(struct sk_buff *skb,/* TCP SACK sequence number adjustment */ static unsigned int nf_ct_sack_adjust (struct sk_buff *skb,unsigned int protoff, -struct tcphdr *tcph,struct nf_conn *ct,enum ip_conntrack_info ctinfo) { -unsigned int dir, optoff, optend; +struct tcphdr *tcph = (void *)skb->data + protoff;struct nf_conn_seqadj *seqadj =nfct_seqadj (ct); +unsigned int dir, optoff, optend; optoff = protoff +sizeof (struct tcphdr ); optend = protoff + tcph->doff *4 ;
@@ -128,6 +128,7 @@ static unsigned int nf_ct_sack_adjust(struct sk_buff *skb,if (!skb_make_writable (skb, optend))return 0 ; + tcph = (void *)skb->data + protoff; dir =CTINFO2DIR (ctinfo);while (optoff < optend) {
@@ -207,7 +208,7 @@ int nf_ct_seq_adjust(struct sk_buff *skb, ntohl(newack)); tcph->ack_seq = newack; - res =nf_ct_sack_adjust (skb, protoff, tcph, ct, ctinfo); + res =nf_ct_sack_adjust (skb, protoff, ct, ctinfo); out:spin_unlock_bh (&ct->lock);
net/sunrpc/auth_gss/svcauth_gss.c +4 -4
@@ -1112,7 +1112,7 @@ static int svcauth_gss_legacy_init(struct svc_rqst *rqstp,struct kvec *resv = &rqstp->rq_res.head[0 ];struct rsi *rsip, rsikey;int ret; -struct sunrpc_net *sn =net_generic (rqstp->rq_xprt->xpt_net, sunrpc_net_id); +struct sunrpc_net *sn =net_generic (SVC_NET (rqstp), sunrpc_net_id);memset (&rsikey,0 ,sizeof (rsikey)); ret = gss_read_verf(gc, argv, authp,
@@ -1223,7 +1223,7 @@ static int svcauth_gss_proxy_init(struct svc_rqst *rqstp,uint64_t handle;int status;int ret; -struct net *net = rqstp->rq_xprt->xpt_net; +struct net *net =SVC_NET (rqstp);struct sunrpc_net *sn =net_generic (net, sunrpc_net_id);memset (&ud,0 ,sizeof (ud));
@@ -1414,7 +1414,7 @@ svcauth_gss_accept(struct svc_rqst *rqstp, __be32 *authp)__be32 *rpcstart;__be32 *reject_stat = resv->iov_base + resv->iov_len;int ret; -struct sunrpc_net *sn =net_generic (rqstp->rq_xprt->xpt_net, sunrpc_net_id); +struct sunrpc_net *sn =net_generic (SVC_NET (rqstp), sunrpc_net_id);dprintk ("RPC: svcauth_gss: argv->iov_len = %zd\n" , argv->iov_len);
@@ -1702,7 +1702,7 @@ svcauth_gss_release(struct svc_rqst *rqstp)struct rpc_gss_wire_cred *gc = &gsd->clcred;struct xdr_buf *resbuf = &rqstp->rq_res;int stat = -EINVAL ; -struct sunrpc_net *sn =net_generic (rqstp->rq_xprt->xpt_net, sunrpc_net_id); +struct sunrpc_net *sn =net_generic (SVC_NET (rqstp), sunrpc_net_id);if (gc->gc_proc !=RPC_GSS_PROC_DATA ) goto out;
net/sunrpc/cache.c +9 -1
@@ -54,6 +54,11 @@ static void cache_init(struct cache_head *h, struct cache_detail *detail) h->last_refresh = now; } +static void cache_fresh_locked (struct cache_head *head,time_t expiry, +struct cache_detail *detail); +static void cache_fresh_unlocked (struct cache_head *head, +struct cache_detail *detail); +struct cache_head *sunrpc_cache_lookup (struct cache_detail *detail,struct cache_head *key,int hash) {
@@ -95,6 +100,7 @@ struct cache_head *sunrpc_cache_lookup(struct cache_detail *detail,if (cache_is_expired (detail, tmp)) {hlist_del_init (&tmp->cache_list); detail->entries --; +cache_fresh_locked (tmp,0 , detail); freeme = tmp;break ; }
@@ -110,8 +116,10 @@ struct cache_head *sunrpc_cache_lookup(struct cache_detail *detail,cache_get (new);write_unlock (&detail->hash_lock); -if (freeme) +if (freeme) { +cache_fresh_unlocked (freeme, detail);cache_put (freeme, detail); + }return new; }EXPORT_SYMBOL_GPL (sunrpc_cache_lookup);
net/sunrpc/xprtsock.c +2 -2
@@ -2209,8 +2209,8 @@ static void xs_udp_setup_socket(struct work_struct *work)trace_rpc_socket_connect (xprt, sock,0 ); status =0 ; out: -xprt_unlock_connect (xprt, transport);xprt_clear_connecting (xprt); +xprt_unlock_connect (xprt, transport);xprt_wake_pending_tasks (xprt, status); }
@@ -2395,8 +2395,8 @@ static void xs_tcp_setup_socket(struct work_struct *work) } status = -EAGAIN ; out: -xprt_unlock_connect (xprt, transport);xprt_clear_connecting (xprt); +xprt_unlock_connect (xprt, transport);xprt_wake_pending_tasks (xprt, status); }
net/xfrm/xfrm_state.c +1 -1
@@ -641,7 +641,7 @@ void xfrm_sad_getinfo(struct net *net, struct xfrmk_sadinfo *si) {spin_lock_bh (&net->xfrm.xfrm_state_lock); si->sadcnt = net->xfrm.state_num; - si->sadhcnt = net->xfrm.state_hmask; + si->sadhcnt = net->xfrm.state_hmask +1 ; si->sadhmcnt = xfrm_state_hashmax;spin_unlock_bh (&net->xfrm.xfrm_state_lock); }
scripts/checkstack.pl +2 -2
@@ -46,8 +46,8 @@ my (@stack, $re, $dre, $x, $xs, $funcre); $xs = "[0-9a-f ]"; # hex character or space $funcre = qr/^$x* <(.*)>:$/; if ($arch eq 'aarch64') { - #ffffffc0006325cc: a9bb7bfd stp x29, x30, [sp,#-80]! - $re = qr/^.*stp.*sp,\#-([0-9]{1,8})\]\!/o; + #ffffffc0006325cc: a9bb7bfd stp x29, x30, [sp, #-80]! + $re = qr/^.*stp.*sp, \#-([0-9]{1,8})\]\!/o; } elsif ($arch eq 'arm') { #c0008ffc: e24dd064 sub sp, sp, #100 ; 0x64 $re = qr/.*sub.*sp, sp, #(([0-9]{2}|[3-9])[0-9]{2})/o;
sound/pci/cs46xx/dsp_spos.c +3 -0
@@ -899,6 +899,9 @@ int cs46xx_dsp_proc_done (struct snd_cs46xx *chip)struct dsp_spos_instance * ins = chip->dsp_spos_instance;int i; +if (!ins) +return 0 ; +snd_info_free_entry (ins->proc_sym_info_entry); ins->proc_sym_info_entry =NULL ;
sound/usb/mixer.c +8 -2
@@ -1882,7 +1882,7 @@ static int build_audio_procunit(struct mixer_build *state, int unitid, char *name) {struct uac_processing_unit_descriptor *desc = raw_desc; -int num_ins = desc->bNrInPins; +int num_ins;struct usb_mixer_elem_info *cval;struct snd_kcontrol *kctl;int i, err, nameid, type, len;
@@ -1897,7 +1897,13 @@ static int build_audio_procunit(struct mixer_build *state, int unitid, 0, NULL, default_value_info }; -if (desc->bLength <13 || desc->bLength <13 + num_ins || +if (desc->bLength <13 ) { +usb_audio_err (state->chip,"invalid %s descriptor (id %d)\n" , name, unitid); +return -EINVAL ; + } + + num_ins = desc->bNrInPins; +if (desc->bLength <13 + num_ins || desc->bLength < num_ins +uac_processing_unit_bControlSize (desc, state->mixer->protocol)) {usb_audio_err (state->chip,"invalid %s descriptor (id %d)\n" , name, unitid);return -EINVAL ;
sound/usb/quirks-table.h +3 -0
@@ -3321,6 +3321,9 @@ AU0828_DEVICE(0x2040, 0x7270, "Hauppauge", "HVR-950Q"), } } }, + { + .ifnum = -1 + }, } } },
tools/testing/nvdimm/test/iomap.c +1 -1
@@ -114,7 +114,7 @@ void *__wrap_devm_memremap_pages(struct device *dev, struct resource *res,return nfit_res->buf + offset - nfit_res->res.start;return devm_memremap_pages (dev, res, ref, altmap); } -EXPORT_SYMBOL (__wrap_devm_memremap_pages); +EXPORT_SYMBOL_GPL (__wrap_devm_memremap_pages);pfn_t __wrap_phys_to_pfn_t (phys_addr_t addr,unsigned long flags) {