Linux 3.4.19
Greg KH
maintainerI'm announcing the release of the 3.4.19 kernel.
All users of the 3.4 kernel series must upgrade.
The updated 3.4.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.4.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/x86/xen/mmu.c | 21 ++++++- drivers/gpu/drm/drm_fops.c | 5 + drivers/gpu/drm/i915/intel_drv.h | 4 - drivers/gpu/drm/i915/intel_sdvo.c | 59 ++++++++++++++----- drivers/gpu/drm/i915/intel_sdvo_regs.h | 2 drivers/gpu/drm/radeon/evergreen_cs.c | 3 + drivers/gpu/drm/radeon/evergreend.h | 4 + drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 1 drivers/gpu/drm/radeon/si.c | 1 drivers/gpu/drm/radeon/sid.h | 1 drivers/gpu/drm/udl/udl_drv.h | 2 drivers/gpu/drm/udl/udl_fb.c | 12 ++-- drivers/gpu/drm/udl/udl_transfer.c | 5 + drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c | 2 drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 5 + drivers/hwmon/w83627ehf.c | 1 drivers/input/touchscreen/tsc40.c | 1 drivers/mmc/host/sdhci.c | 23 ++++--- drivers/net/ethernet/nxp/lpc_eth.c | 1 drivers/net/usb/usbnet.c | 3 + drivers/net/wireless/ath/ath9k/xmit.c | 10 ++- drivers/net/wireless/rt2x00/rt2800lib.c | 2 drivers/target/iscsi/iscsi_target.c | 4 + drivers/target/iscsi/iscsi_target_core.h | 1 drivers/target/iscsi/iscsi_target_login.c | 1 drivers/target/iscsi/iscsi_target_util.c | 22 ++++++- drivers/target/iscsi/iscsi_target_util.h | 1 drivers/target/target_core_configfs.c | 3 - drivers/target/target_core_device.c | 18 +++--- drivers/target/target_core_tmr.c | 6 +- drivers/usb/serial/mos7840.c | 1 drivers/xen/gntdev.c | 36 ++++++------ fs/nfs/dir.c | 4 - fs/nfs/dns_resolve.c | 5 + fs/nfs/internal.h | 5 + fs/nfs/mount_clnt.c | 2 fs/nfs/namespace.c | 19 ++++-- fs/nfs/nfs4namespace.c | 3 - fs/nfs/nfs4proc.c | 37 ++++++++---- fs/nfs/super.c | 2 fs/nfsd/export.c | 6 +- fs/xfs/xfs_log_recover.c | 2 include/linux/sunrpc/cache.h | 16 +++++ include/net/cfg80211.h | 9 +++ include/sound/core.h | 3 + include/trace/events/xen.h | 8 ++ kernel/futex.c | 41 +++++++------ net/core/dev.c | 2 net/ipv4/inet_diag.c | 5 + net/ipv4/tcp.c | 8 +- net/ipv4/tcp_illinois.c | 8 +- net/ipv6/ndisc.c | 3 - net/ipv6/route.c | 4 - net/l2tp/l2tp_eth.c | 1 net/mac80211/ibss.c | 2 net/mac80211/rx.c | 72 ++++++++++++++++++------ net/mac80211/util.c | 39 ++++++++++--- net/netlink/af_netlink.c | 19 +++++- net/sctp/sm_sideeffect.c | 3 - net/wireless/core.c | 3 - net/wireless/util.c | 14 ++-- sound/core/compress_offload.c | 9 ++- sound/core/control.c | 5 + sound/core/hwdep.c | 12 +++- sound/core/init.c | 50 ++++++++++------ sound/core/oss/mixer_oss.c | 11 +++ sound/core/oss/pcm_oss.c | 7 ++ sound/core/pcm.c | 13 +++- sound/core/pcm_native.c | 35 +++++++++-- sound/core/rawmidi.c | 26 ++++++++ sound/core/sound.c | 11 +++ sound/core/sound_oss.c | 10 ++- sound/usb/card.c | 14 +++- sound/usb/card.h | 1 sound/usb/endpoint.c | 9 ++- sound/usb/mixer.c | 65 ++++++++++++++------- sound/usb/mixer_quirks.c | 37 +++++++++++- sound/usb/pcm.c | 35 ++++++++--- sound/usb/proc.c | 4 - sound/usb/usbaudio.h | 2 81 files changed, 701 insertions(+), 263 deletions(-)
Alex Deucher (2):
drm/radeon/cayman: add some missing regs to the VM reg checker drm/radeon/si: add some missing regs to the VM reg checker
Antonio Quartulli (1):
mac80211: fix SSID copy on IBSS JOIN
Ben Hutchings (1):
nfs: Show original device name verbatim in /proc/*/mount{s,info}Chris Ball (1):
mmc: sdhci: fix NULL dereference in sdhci_request() tuning
Cyrill Gorcunov (1):
net: inet_diag -- Return error code if protocol handler is missed
Daniel Vetter (2):
drm/i915: fixup infoframe support for sdvo drm/i915: clear the entire sdvo infoframe buffer
Dave Airlie (1):
drm/udl: fix stride issues scanning out stride != width*bpp
Dave Chinner (1):
xfs: fix reading of wrapped log data
David Vrabel (1):
xen/gntdev: don't leak memory from IOCTL_GNTDEV_MAP_GRANT_REF
Egbert Eich (1):
DRM/Radeon: Fix Load Detection on legacy primary DAC.
Eric Dumazet (2):
netlink: use kfree_rcu() in netlink_release()
tcp: fix FIONREAD/SIOCINQ
Eric Leblond (1):
af-packet: fix oops when socket is not present
Felix Fietkau (2):
ath9k: fix stale pointers potentially causing access to free'd skbs
cfg80211: fix antenna gain handling
Greg Kroah-Hartman (1):
Linux 3.4.19
Hannes Frederic Sowa (1):
ipv6: send unsolicited neighbour advertisements to all-nodes
Hemant Kumar (1):
net: usb: Fix memory leak on Tx data path
Ilija Hadzic (1):
drm: restore open_count if drm_setup fails
J. Bruce Fields (1):
nfsd: add get_uint for u32's
Javier Cardona (2):
mac80211: Only process mesh config header on frames that RA_MATCH
mac80211: don't inspect Sequence Control field on control frames
Jean Delvare (1):
hwmon: (w83627ehf) Force initial bank selection
Jesper Dangaard Brouer (1):
net: fix divide by zero in tcp algorithm illinois
Johan Hovold (1):
USB: mos7840: remove unused variable
Johannes Berg (5):
wireless: drop invalid mesh address extension frames
mac80211: use blacklist for duplicate IE check
mac80211: check management frame header length
mac80211: verify that skb data is present
mac80211: make sure data is accessible in EAPOL check
Konrad Rzeszutek Wilk (1):
xen/mmu: Use Xen specific TLB flush instead of the generic one.
Li RongQing (1):
ipv6: Set default hoplimit as zero.
NeilBrown (1):
NFS: fix bug in legacy DNS resolver.
Peter Senna Tschudin (1):
drivers/net/ethernet/nxp/lpc_eth.c: Call mdiobus_unregister before mdiobus_free
Roland Dreier (3):
target: Don't return success from module_init() if setup fails
target: Avoid integer overflow in se_dev_align_max_sectors()
iscsi-target: Fix missed wakeup race in TX thread
Rolf Eike Beer (1):
Input: tsc40 - remove wrong announcement of pressure support
Scott Mayhew (1):
nfsv3: Make v3 mounts fail with ETIMEDOUTs instead EIO on mountd timeouts
Stanislaw Gruszka (1):
rt2800: validate step value for temperature compensation
Steve Hodgson (1):
target: Fix incorrect usage of nested IRQ spinlocks in ABORT_TASK path
Sven Eckelmann (1):
ath9k: Test for TID only in BlockAcks while checking tx status
Takashi Iwai (8):
ALSA: PCM: Fix some races at disconnection
ALSA: usb-audio: Fix races at disconnection
ALSA: usb-audio: Use rwsem for disconnect protection
ALSA: usb-audio: Fix races at disconnection in mixer_quirks.c
ALSA: Add a reference counter to card instance
ALSA: Avoid endless sleep after disconnect
ALSA: Fix card refcount unbalance
ALSA: usb-audio: Fix mutex deadlock at disconnection
Thomas Gleixner (1):
futex: Handle futex_pi OWNER_DIED take over correctly
Thomas Hellstrom (2):
drm/vmwgfx: Fix hibernation device reset
drm/vmwgfx: Fix a case where the code would BUG when trying to pin GMR memory
Tom Parkin (1):
l2tp: fix oops in l2tp_eth_create() error path
Trond Myklebust (3):
NFSv4: nfs4_locku_done must release the sequence id
NFSv4.1: We must release the sequence id when we fail to get a session slot
NFS: Fix Oopses in nfs_lookup_revalidate and nfs4_lookup_revalidate
Zijie Pan (1):
sctp: fix call to SCTP_CMD_PROCESS_SACK in sctp_cmd_interpreter()
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 4 -SUBLEVEL = 18 +SUBLEVEL = 19 EXTRAVERSION = NAME = Saber-toothed Squirrel
arch/x86/xen/mmu.c +20 -1
@@ -1203,6 +1203,25 @@ unsigned long xen_read_cr2_direct(void)return this_cpu_read (xen_vcpu_info.arch.cr2); } +void xen_flush_tlb_all (void ) +{ +struct mmuext_op *op; +struct multicall_space mcs; + +trace_xen_mmu_flush_tlb_all (0 ); + +preempt_disable (); + + mcs =xen_mc_entry (sizeof (*op)); + + op = mcs.args; + op->cmd =MMUEXT_TLB_FLUSH_ALL ; +MULTI_mmuext_op (mcs.mc, op,1 ,NULL ,DOMID_SELF ); + +xen_mc_issue (PARAVIRT_LAZY_MMU ); + +preempt_enable (); +}static void xen_flush_tlb (void ) {struct mmuext_op *op;
@@ -2364,7 +2383,7 @@ int xen_remap_domain_mfn_range(struct vm_area_struct *vma, err =0 ; out: -flush_tlb_all (); +xen_flush_tlb_all ();return err; }
drivers/gpu/drm/drm_fops.c +4 -1
@@ -139,8 +139,11 @@ int drm_open(struct inode *inode, struct file *filp) retcode =drm_open_helper (inode, filp, dev);if (!retcode) {atomic_inc (&dev->counts[_DRM_STAT_OPENS]); -if (!dev->open_count++) +if (!dev->open_count++) { retcode =drm_setup (dev); +if (retcode) + dev->open_count--; + } }if (!retcode) {mutex_lock (&dev->struct_mutex);
drivers/gpu/drm/i915/intel_drv.h +2 -2
@@ -247,12 +247,12 @@ struct dip_infoframe {uint16_t bottom_bar_start;uint16_t left_bar_end;uint16_t right_bar_start; - } avi; + } __attribute__ ((packed)) avi;struct {uint8_t vn[8 ];uint8_t pd[16 ];uint8_t sdi; - } spd; + } __attribute__ ((packed)) spd;uint8_t payload[27 ]; } __attribute__ ((packed)) body; } __attribute__((packed));
drivers/gpu/drm/i915/intel_sdvo.c +44 -15
81 lines not on this page · raw message
drivers/gpu/drm/i915/intel_sdvo_regs.h +2 -0
@@ -708,6 +708,8 @@ struct intel_sdvo_enhancements_arg {#define SDVO_CMD_SET_AUDIO_STAT 0x91#define SDVO_CMD_GET_AUDIO_STAT 0x92#define SDVO_CMD_SET_HBUF_INDEX 0x93 +#define SDVO_HBUF_INDEX_ELD 0 +#define SDVO_HBUF_INDEX_AVI_IF 1#define SDVO_CMD_GET_HBUF_INDEX 0x94#define SDVO_CMD_GET_HBUF_INFO 0x95#define SDVO_CMD_SET_HBUF_AV_SPLIT 0x96
drivers/gpu/drm/radeon/evergreen_cs.c +3 -0
@@ -2671,6 +2671,9 @@ static bool evergreen_vm_reg_valid(u32 reg)/* check config regs */ switch (reg) {case GRBM_GFX_INDEX : +case CP_STRMOUT_CNTL : +case CP_COHER_CNTL : +case CP_COHER_SIZE :case VGT_VTX_VECT_EJECT_REG :case VGT_CACHE_INVALIDATION :case VGT_GS_VERTEX_REUSE :
drivers/gpu/drm/radeon/evergreend.h +4 -0
@@ -77,6 +77,10 @@#define CONFIG_MEMSIZE 0x5428 +#define CP_STRMOUT_CNTL 0x84FC + +#define CP_COHER_CNTL 0x85F0 +#define CP_COHER_SIZE 0x85F4#define CP_COHER_BASE 0x85F8#define CP_ME_CNTL 0x86D8#define CP_ME_HALT (1 << 28)
drivers/gpu/drm/radeon/radeon_legacy_encoders.c +1 -0
@@ -650,6 +650,7 @@ static enum drm_connector_status radeon_legacy_primary_dac_detect(struct drm_enc tmp |=RADEON_DAC_RANGE_CNTL_PS2 |RADEON_DAC_CMP_EN ;WREG32 (RADEON_DAC_CNTL , tmp); + tmp = dac_macro_cntl; tmp &= ~(RADEON_DAC_PDWN_R |RADEON_DAC_PDWN_G |RADEON_DAC_PDWN_B );
drivers/gpu/drm/radeon/si.c +1 -0
@@ -2593,6 +2593,7 @@ static bool si_vm_reg_valid(u32 reg)/* check config regs */ switch (reg) {case GRBM_GFX_INDEX : +case CP_STRMOUT_CNTL :case VGT_VTX_VECT_EJECT_REG :case VGT_CACHE_INVALIDATION :case VGT_ESGS_RING_SIZE :
drivers/gpu/drm/radeon/sid.h +1 -0
@@ -413,6 +413,7 @@# define RDERR_INT_ENABLE (1 << 0)# define GUI_IDLE_INT_ENABLE (1 << 19) +#define CP_STRMOUT_CNTL 0x84FC#define SCRATCH_REG0 0x8500#define SCRATCH_REG1 0x8504#define SCRATCH_REG2 0x8508
drivers/gpu/drm/udl/udl_drv.h +1 -1
@@ -103,7 +103,7 @@ udl_fb_user_fb_create(struct drm_device *dev,int udl_render_hline (struct drm_device *dev,int bpp,struct urb **urb_ptr,const char *front,char **urb_buf_ptr, -u32 byte_offset,u32 byte_width, +u32 byte_offset,u32 device_byte_offset,u32 byte_width,int *ident_ptr,int *sent_ptr); int udl_dumb_create(struct drm_file *file_priv,
drivers/gpu/drm/udl/udl_fb.c +7 -5
@@ -114,9 +114,10 @@ static void udlfb_dpy_deferred_io(struct fb_info *info,list_for_each_entry (cur, &fbdefio->pagelist, lru) {if (udl_render_hline (dev, (ufbdev->ufb.base.bits_per_pixel /8 ), - &urb, (char *) info->fix.smem_start, - &cmd, cur->index <<PAGE_SHIFT , -PAGE_SIZE , &bytes_identical, &bytes_sent)) + &urb, (char *) info->fix.smem_start, + &cmd, cur->index <<PAGE_SHIFT , + cur->index <<PAGE_SHIFT , +PAGE_SIZE , &bytes_identical, &bytes_sent)) goto error; bytes_rendered +=PAGE_SIZE ; }
@@ -178,10 +179,11 @@ int udl_handle_damage(struct udl_framebuffer *fb, int x, int y,for (i = y; i < y + height ; i++) {const int line_offset = fb->base.pitches[0 ] * i;const int byte_offset = line_offset + (x * bpp); - +const int dev_byte_offset = (fb->base.width * bpp * i) + (x * bpp);if (udl_render_hline (dev, bpp, &urb, (char *) fb->obj->vmapping, - &cmd, byte_offset, width * bpp, + &cmd, byte_offset, dev_byte_offset, + width * bpp, &bytes_identical, &bytes_sent)) goto error; }
drivers/gpu/drm/udl/udl_transfer.c +3 -2
@@ -213,11 +213,12 @@ static void udl_compress_hline16(*/ int udl_render_hline (struct drm_device *dev,int bpp,struct urb **urb_ptr,const char *front,char **urb_buf_ptr, -u32 byte_offset,u32 byte_width, +u32 byte_offset,u32 device_byte_offset, +u32 byte_width,int *ident_ptr,int *sent_ptr) {const u8 *line_start, *line_end, *next_pixel; -u32 base16 =0 + (byte_offset / bpp) *2 ; +u32 base16 =0 + (device_byte_offset / bpp) *2 ;struct urb *urb = *urb_ptr;u8 *cmd = *urb_buf_ptr;u8 *cmd_end = (u8 *) urb->transfer_buffer + urb->transfer_buffer_length;
drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c +1 -1
@@ -306,7 +306,7 @@ void vmw_bo_pin(struct ttm_buffer_object *bo, bool pin)BUG_ON (!atomic_read (&bo->reserved));BUG_ON (old_mem_type !=TTM_PL_VRAM && - old_mem_type !=VMW_PL_FLAG_GMR ); + old_mem_type !=VMW_PL_GMR ); pl_flags =TTM_PL_FLAG_VRAM |VMW_PL_FLAG_GMR |TTM_PL_FLAG_CACHED ;if (pin)
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +5 -0
@@ -1102,6 +1102,11 @@ static void vmw_pm_complete(struct device *kdev)struct drm_device *dev =pci_get_drvdata (pdev);struct vmw_private *dev_priv =vmw_priv (dev); +mutex_lock (&dev_priv->hw_mutex); +vmw_write (dev_priv,SVGA_REG_ID ,SVGA_ID_2 ); + (void )vmw_read (dev_priv,SVGA_REG_ID ); +mutex_unlock (&dev_priv->hw_mutex); +/** * Reclaim 3d reference held by fbdev and potentially * start fifo.
drivers/hwmon/w83627ehf.c +1 -0
@@ -2082,6 +2082,7 @@ static int __devinit w83627ehf_probe(struct platform_device *pdev)mutex_init (&data->lock);mutex_init (&data->update_lock); data->name = w83627ehf_device_names[sio_data->kind]; + data->bank =0xff ;/* Force initial bank selection */ platform_set_drvdata (pdev, data);/* 627EHG and 627EHF have 10 voltage inputs; 627DHG and 667HG have 9 */
drivers/input/touchscreen/tsc40.c +0 -1
@@ -107,7 +107,6 @@ static int tsc_connect(struct serio *serio, struct serio_driver *drv)__set_bit (BTN_TOUCH , input_dev->keybit);input_set_abs_params (ptsc->dev,ABS_X ,0 ,0x3ff ,0 ,0 );input_set_abs_params (ptsc->dev,ABS_Y ,0 ,0x3ff ,0 ,0 ); -input_set_abs_params (ptsc->dev,ABS_PRESSURE ,0 ,0 ,0 ,0 );serio_set_drvdata (serio, ptsc);
drivers/mmc/host/sdhci.c +13 -10
@@ -1294,16 +1294,19 @@ static void sdhci_request(struct mmc_host *mmc, struct mmc_request *mrq)*/ if ((host->flags &SDHCI_NEEDS_RETUNING ) && !(present_state & (SDHCI_DOING_WRITE |SDHCI_DOING_READ ))) { -/* eMMC uses cmd21 while sd and sdio use cmd19 */ - tuning_opcode = mmc->card->type ==MMC_TYPE_MMC ? -MMC_SEND_TUNING_BLOCK_HS200 : -MMC_SEND_TUNING_BLOCK ; -spin_unlock_irqrestore (&host->lock, flags); -sdhci_execute_tuning (mmc, tuning_opcode); -spin_lock_irqsave (&host->lock, flags); - -/* Restore original mmc_request structure */ - host->mrq = mrq; +if (mmc->card) { +/* eMMC uses cmd21 but sd and sdio use cmd19 */ + tuning_opcode = + mmc->card->type ==MMC_TYPE_MMC ? +MMC_SEND_TUNING_BLOCK_HS200 : +MMC_SEND_TUNING_BLOCK ; +spin_unlock_irqrestore (&host->lock, flags); +sdhci_execute_tuning (mmc, tuning_opcode); +spin_lock_irqsave (&host->lock, flags); + +/* Restore original mmc_request structure */ + host->mrq = mrq; + } }if (mrq->sbc && !(host->flags &SDHCI_AUTO_CMD23 ))
drivers/net/ethernet/nxp/lpc_eth.c +1 -0
@@ -1523,6 +1523,7 @@ static int lpc_eth_drv_remove(struct platform_device *pdev) pldat->dma_buff_base_p);free_irq (ndev->irq, ndev);iounmap (pldat->net_base); +mdiobus_unregister (pldat->mii_bus);mdiobus_free (pldat->mii_bus);clk_disable (pldat->clk);clk_put (pldat->clk);
drivers/net/usb/usbnet.c +3 -0
@@ -1158,6 +1158,7 @@ netdev_tx_t usbnet_start_xmit (struct sk_buff *skb,usb_anchor_urb (urb, &dev->deferred);/* no use to process more packets */ netif_stop_queue (net); +usb_put_urb (urb);spin_unlock_irqrestore (&dev->txq.lock, flags);netdev_dbg (dev->net,"Delaying transmission for resumption\n" ); goto deferred;
@@ -1299,6 +1300,8 @@ void usbnet_disconnect (struct usb_interface *intf)cancel_work_sync (&dev->kevent); +usb_scuttle_anchored_urbs (&dev->deferred); +if (dev->driver_info->unbind) dev->driver_info->unbind (dev, intf);
drivers/net/wireless/ath/ath9k/xmit.c +8 -2
@@ -337,6 +337,7 @@ static struct ath_buf *ath_tx_get_buffer(struct ath_softc *sc) } bf = list_first_entry(&sc->tx.txbuf, struct ath_buf, list); + bf->bf_next =NULL ;list_del (&bf->list);spin_unlock_bh (&sc->tx.txbuflock);
@@ -418,7 +419,7 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,u16 seq_st =0 , acked_cnt =0 , txfail_cnt =0 , seq_first;u32 ba[WME_BA_BMP_SIZE >>5 ];int isaggr, txfail, txpending, sendbar =0 , needreset =0 , nbad =0 ; -bool rc_update = true; +bool rc_update = true, isba;struct ieee80211_tx_rate rates[4 ];struct ath_frame_info *fi;int nframes;
@@ -462,13 +463,17 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq, tidno =ieee80211_get_qos_ctl (hdr)[0 ] &IEEE80211_QOS_CTL_TID_MASK ; tid =ATH_AN_2_TID (an, tidno); seq_first = tid->seq_start; + isba = ts->ts_flags &ATH9K_TX_BA ;/* * The hardware occasionally sends a tx status for the wrong TID. * In this case, the BA status cannot be considered valid and all * subframes need to be retransmitted +* +* Only BlockAcks have a TID and therefore normal Acks cannot be +* checked */ -if (tidno != ts->tid) +if (isba && tidno != ts->tid) txok = false; isaggr =bf_isaggr (bf);
@@ -1760,6 +1765,7 @@ static void ath_tx_send_normal(struct ath_softc *sc, struct ath_txq *txq,list_add_tail (&bf->list, &bf_head); bf->bf_state.bf_type =0 ; + bf->bf_next =NULL ; bf->bf_lastbf = bf;ath_tx_fill_desc (sc, bf, txq, fi->framelen);ath_tx_txqaddbuf (sc, txq, &bf_head, false);
drivers/net/wireless/rt2x00/rt2800lib.c +1 -1
@@ -2235,7 +2235,7 @@ static int rt2800_get_gain_calibration_delta(struct rt2x00_dev *rt2x00dev)/* * Check if temperature compensation is supported. */ -if (tssi_bounds[4 ] ==0xff ) +if (tssi_bounds[4 ] ==0xff || step ==0xff )return 0 ;/*
drivers/target/iscsi/iscsi_target.c +3 -1
@@ -3514,7 +3514,9 @@ restart:*/ iscsit_thread_check_cpumask (conn, current,1 ); -schedule_timeout_interruptible (MAX_SCHEDULE_TIMEOUT ); +wait_event_interruptible (conn->queues_wq, + !iscsit_conn_all_queues_empty (conn) || + ts->status ==ISCSI_THREAD_SET_RESET );if ((ts->status ==ISCSI_THREAD_SET_RESET ) ||signal_pending (current))
drivers/target/iscsi/iscsi_target_core.h +1 -0
@@ -491,6 +491,7 @@ struct iscsi_tmr_req { };struct iscsi_conn { +wait_queue_head_t queues_wq;/* Authentication Successful for this connection */ u8 auth_complete;/* State connection is currently in */
drivers/target/iscsi/iscsi_target_login.c +1 -0
@@ -45,6 +45,7 @@ extern spinlock_t sess_idr_lock;static int iscsi_login_init_conn (struct iscsi_conn *conn) { +init_waitqueue_head (&conn->queues_wq);INIT_LIST_HEAD (&conn->conn_list);INIT_LIST_HEAD (&conn->conn_cmd_list);INIT_LIST_HEAD (&conn->immed_queue_list);
drivers/target/iscsi/iscsi_target_util.c +20 -2
@@ -656,7 +656,7 @@ void iscsit_add_cmd_to_immediate_queue(atomic_set (&conn->check_immediate_queue,1 );spin_unlock_bh (&conn->immed_queue_lock); -wake_up_process (conn->thread_set->tx_thread); +wake_up (&conn->queues_wq); }struct iscsi_queue_req *iscsit_get_cmd_from_immediate_queue (struct iscsi_conn *conn)
@@ -730,7 +730,7 @@ void iscsit_add_cmd_to_response_queue(atomic_inc (&cmd->response_queue_count);spin_unlock_bh (&conn->response_queue_lock); -wake_up_process (conn->thread_set->tx_thread); +wake_up (&conn->queues_wq); }struct iscsi_queue_req *iscsit_get_cmd_from_response_queue (struct iscsi_conn *conn)
@@ -784,6 +784,24 @@ static void iscsit_remove_cmd_from_response_queue( } } +bool iscsit_conn_all_queues_empty (struct iscsi_conn *conn) +{ +bool empty; + +spin_lock_bh (&conn->immed_queue_lock); + empty =list_empty (&conn->immed_queue_list); +spin_unlock_bh (&conn->immed_queue_lock); + +if (!empty) +return empty; + +spin_lock_bh (&conn->response_queue_lock); + empty =list_empty (&conn->response_queue_list); +spin_unlock_bh (&conn->response_queue_lock); + +return empty; +} +void iscsit_free_queue_reqs_for_conn (struct iscsi_conn *conn) {struct iscsi_queue_req *qr, *qr_tmp;
drivers/target/iscsi/iscsi_target_util.h +1 -0
@@ -28,6 +28,7 @@ extern struct iscsi_queue_req *iscsit_get_cmd_from_immediate_queue(struct iscsi_extern void iscsit_add_cmd_to_response_queue (struct iscsi_cmd *,struct iscsi_conn *,u8 );extern struct iscsi_queue_req *iscsit_get_cmd_from_response_queue (struct iscsi_conn *);extern void iscsit_remove_cmd_from_tx_queues (struct iscsi_cmd *,struct iscsi_conn *); +extern bool iscsit_conn_all_queues_empty (struct iscsi_conn *);extern void iscsit_free_queue_reqs_for_conn (struct iscsi_conn *);extern void iscsit_release_cmd (struct iscsi_cmd *);extern void iscsit_free_cmd (struct iscsi_cmd *);
drivers/target/target_core_configfs.c +2 -1
@@ -3197,7 +3197,8 @@ static int __init target_core_init_configfs(void)if (ret <0 ) goto out; -if (core_dev_setup_virtual_lun0 () <0 ) + ret =core_dev_setup_virtual_lun0 (); +if (ret <0 ) goto out;return 0 ;
drivers/target/target_core_device.c +9 -9
@@ -826,20 +826,20 @@ int se_dev_check_shutdown(struct se_device *dev)u32 se_dev_align_max_sectors (u32 max_sectors,u32 block_size) { -u32 tmp, aligned_max_sectors; +u32 aligned_max_sectors; +u32 alignment;/* * Limit max_sectors to a PAGE_SIZE aligned value for modern * transport_allocate_data_tasks() operation. */ - tmp =rounddown ((max_sectors * block_size),PAGE_SIZE ); - aligned_max_sectors = (tmp / block_size); -if (max_sectors != aligned_max_sectors) { -printk (KERN_INFO "Rounding down aligned max_sectors from %u" -" to %u\n" , max_sectors, aligned_max_sectors); -return aligned_max_sectors; - } + alignment =max (1ul ,PAGE_SIZE / block_size); + aligned_max_sectors =rounddown (max_sectors, alignment); + +if (max_sectors != aligned_max_sectors) +pr_info ("Rounding down aligned max_sectors from %u to %u\n" , + max_sectors, aligned_max_sectors); -return max_sectors; +return aligned_max_sectors; } void se_dev_set_default_attribs(
drivers/target/target_core_tmr.c +3 -3
@@ -140,15 +140,15 @@ void core_tmr_abort_task(printk ("ABORT_TASK: Found referenced %s task_tag: %u\n" , se_cmd->se_tfo->get_fabric_name (), ref_tag); -spin_lock_irq (&se_cmd->t_state_lock); +spin_lock (&se_cmd->t_state_lock);if (se_cmd->transport_state &CMD_T_COMPLETE ) {printk ("ABORT_TASK: ref_tag: %u already complete, skipping\n" , ref_tag); -spin_unlock_irq (&se_cmd->t_state_lock); +spin_unlock (&se_cmd->t_state_lock);spin_unlock_irqrestore (&se_sess->sess_cmd_lock, flags); goto out; } se_cmd->transport_state |=CMD_T_ABORTED ; -spin_unlock_irq (&se_cmd->t_state_lock); +spin_unlock (&se_cmd->t_state_lock);list_del_init (&se_cmd->se_cmd_list);kref_get (&se_cmd->cmd_kref);
drivers/usb/serial/mos7840.c +0 -1
@@ -2581,7 +2581,6 @@ error:static void mos7840_disconnect (struct usb_serial *serial) {int i; -unsigned long flags;struct moschip_port *mos7840_port;dbg ("%s" ," disconnect :entering.........." );
drivers/xen/gntdev.c +19 -17
@@ -105,6 +105,21 @@ static void gntdev_print_maps(struct gntdev_priv *priv,#endif } +static void gntdev_free_map (struct grant_map *map) +{ +if (map ==NULL ) +return ; + +if (map->pages) +free_xenballooned_pages (map->count, map->pages); +kfree (map->pages); +kfree (map->grants); +kfree (map->map_ops); +kfree (map->unmap_ops); +kfree (map->kmap_ops); +kfree (map); +} +static struct grant_map *gntdev_alloc_map (struct gntdev_priv *priv,int count) {struct grant_map *add;
@@ -142,12 +157,7 @@ static struct grant_map *gntdev_alloc_map(struct gntdev_priv *priv, int count)return add; err: -kfree (add->pages); -kfree (add->grants); -kfree (add->map_ops); -kfree (add->unmap_ops); -kfree (add->kmap_ops); -kfree (add); +gntdev_free_map (add);return NULL ; }
@@ -198,17 +208,9 @@ static void gntdev_put_map(struct grant_map *map)evtchn_put (map->notify.event); } -if (map->pages) { -if (!use_ptemod) -unmap_grant_pages (map,0 , map->count); - -free_xenballooned_pages (map->count, map->pages); - } -kfree (map->pages); -kfree (map->grants); -kfree (map->map_ops); -kfree (map->unmap_ops); -kfree (map); +if (map->pages && !use_ptemod) +unmap_grant_pages (map,0 , map->count); +gntdev_free_map (map); }/* ------------------------------------------------------------------ */
fs/nfs/dir.c +2 -2
@@ -1103,7 +1103,7 @@ static int nfs_lookup_revalidate(struct dentry *dentry, struct nameidata *nd)struct nfs_fattr *fattr =NULL ;int error; -if (nd->flags &LOOKUP_RCU ) +if (nd && (nd->flags &LOOKUP_RCU ))return -ECHILD ; parent =dget_parent (dentry);
@@ -1502,7 +1502,7 @@ static int nfs_open_revalidate(struct dentry *dentry, struct nameidata *nd)struct iattr attr;int openflags, ret =0 ; -if (nd->flags &LOOKUP_RCU ) +if (nd && (nd->flags &LOOKUP_RCU ))return -ECHILD ; inode = dentry->d_inode;
fs/nfs/dns_resolve.c +3 -2
@@ -214,7 +214,7 @@ static int nfs_dns_parse(struct cache_detail *cd, char *buf, int buflen) {char buf1[NFS_DNS_HOSTNAME_MAXLEN +1 ];struct nfs_dns_ent key, *item; -unsigned long ttl; +unsigned int ttl;ssize_t len;int ret = -EINVAL ;
@@ -237,7 +237,8 @@ static int nfs_dns_parse(struct cache_detail *cd, char *buf, int buflen) key.namelen = len;memset (&key.h,0 ,sizeof (key.h)); - ttl =get_expiry (&buf); +if (get_uint (&buf, &ttl) <0 ) + goto out;if (ttl ==0 ) goto out; key.h.expiry_time = ttl +seconds_since_boot ();
fs/nfs/internal.h +3 -2
@@ -277,8 +277,9 @@ extern void nfs_sb_active(struct super_block *sb);extern void nfs_sb_deactive (struct super_block *sb);/* namespace.c */ +#define NFS_PATH_CANONICAL 1extern char *nfs_path (char **p,struct dentry *dentry, -char *buffer,ssize_t buflen); +char *buffer,ssize_t buflen,unsigned flags);extern struct vfsmount *nfs_d_automount (struct path *path);#ifdef CONFIG_NFS_V4 rpc_authflavor_t nfs_find_best_sec (struct nfs4_secinfo_flavors *);
@@ -371,7 +372,7 @@ static inline char *nfs_devname(struct dentry *dentry, char *buffer, ssize_t buflen) {char *dummy; -return nfs_path (&dummy, dentry, buffer, buflen); +return nfs_path (&dummy, dentry, buffer, buflen,NFS_PATH_CANONICAL ); }/*
fs/nfs/mount_clnt.c +1 -1
@@ -181,7 +181,7 @@ int nfs_mount(struct nfs_mount_request *info)else msg.rpc_proc = &mnt_clnt->cl_procinfo[MOUNTPROC_MNT ]; - status =rpc_call_sync (mnt_clnt, &msg,0 ); + status =rpc_call_sync (mnt_clnt, &msg,RPC_TASK_SOFT |RPC_TASK_TIMEOUT );rpc_shutdown_client (mnt_clnt);if (status <0 )
fs/nfs/namespace.c +14 -5
@@ -37,6 +37,7 @@ static struct vfsmount *nfs_do_submount(struct dentry *dentry,* @dentry - pointer to dentry * @buffer - result buffer * @buflen - length of buffer +* @flags - options (see below) * * Helper function for constructing the server pathname * by arbitrary hashed dentry.
@@ -44,8 +45,14 @@ static struct vfsmount *nfs_do_submount(struct dentry *dentry,* This is mainly for use in figuring out the path on the * server side when automounting on top of an existing partition * and in generating /proc/mounts and friends. +* +* Supported flags: +* NFS_PATH_CANONICAL: ensure there is exactly one slash after +* the original device (export) name +* (if unset, the original name is returned verbatim) */ -char *nfs_path (char **p,struct dentry *dentry,char *buffer,ssize_t buflen) +char *nfs_path (char **p,struct dentry *dentry,char *buffer,ssize_t buflen, +unsigned flags) {char *end;int namelen;
@@ -78,7 +85,7 @@ rename_retry:rcu_read_unlock (); goto rename_retry; } -if (*end !='/' ) { +if ((flags &NFS_PATH_CANONICAL ) && *end !='/' ) {if (--buflen <0 ) {spin_unlock (&dentry->d_lock);rcu_read_unlock ();
@@ -95,9 +102,11 @@ rename_retry:return end; } namelen =strlen (base); -/* Strip off excess slashes in base string */ -while (namelen >0 && base[namelen -1 ] =='/' ) - namelen--; +if (flags &NFS_PATH_CANONICAL ) { +/* Strip off excess slashes in base string */ +while (namelen >0 && base[namelen -1 ] =='/' ) + namelen--; + } buflen -= namelen;if (buflen <0 ) {spin_unlock (&dentry->d_lock);
fs/nfs/nfs4namespace.c +2 -1
@@ -81,7 +81,8 @@ static char *nfs_path_component(const char *nfspath, const char *end)static char *nfs4_path (struct dentry *dentry,char *buffer,ssize_t buflen) {char *limit; -char *path =nfs_path (&limit, dentry, buffer, buflen); +char *path =nfs_path (&limit, dentry, buffer, buflen, +NFS_PATH_CANONICAL );if (!IS_ERR (path)) {char *path_component =nfs_path_component (path, limit);if (path_component)
fs/nfs/nfs4proc.c +24 -13
@@ -1478,9 +1478,11 @@ static void nfs4_open_prepare(struct rpc_task *task, void *calldata) data->timestamp = jiffies;if (nfs4_setup_sequence (data->o_arg.server, &data->o_arg.seq_args, - &data->o_res.seq_res, task)) -return ; -rpc_call_start (task); + &data->o_res.seq_res, + task) !=0 ) +nfs_release_seqid (data->o_arg.seqid); +else +rpc_call_start (task);return ; unlock_no_action:rcu_read_unlock ();
@@ -2097,9 +2099,10 @@ static void nfs4_close_prepare(struct rpc_task *task, void *data)if (nfs4_setup_sequence (NFS_SERVER (calldata->inode), &calldata->arg.seq_args, &calldata->res.seq_res, - task)) - goto out; -rpc_call_start (task); + task) !=0 ) +nfs_release_seqid (calldata->arg.seqid); +else +rpc_call_start (task); out:dprintk ("%s: done!\n" , __func__); }
@@ -4306,6 +4309,7 @@ static void nfs4_locku_done(struct rpc_task *task, void *data)if (nfs4_async_handle_error (task, calldata->server,NULL ) == -EAGAIN )rpc_restart_call_prepare (task); } +nfs_release_seqid (calldata->arg.seqid); }static void nfs4_locku_prepare (struct rpc_task *task,void *data)
@@ -4322,9 +4326,11 @@ static void nfs4_locku_prepare(struct rpc_task *task, void *data) calldata->timestamp = jiffies;if (nfs4_setup_sequence (calldata->server, &calldata->arg.seq_args, - &calldata->res.seq_res, task)) -return ; -rpc_call_start (task); + &calldata->res.seq_res, + task) !=0 ) +nfs_release_seqid (calldata->arg.seqid); +else +rpc_call_start (task); }static const struct rpc_call_ops nfs4_locku_ops = {
@@ -4469,7 +4475,7 @@ static void nfs4_lock_prepare(struct rpc_task *task, void *calldata)/* Do we need to do an open_to_lock_owner? */ if (!(data->arg.lock_seqid->sequence->flags &NFS_SEQID_CONFIRMED )) {if (nfs_wait_on_sequence (data->arg.open_seqid, task) !=0 ) -return ; + goto out_release_lock_seqid; data->arg.open_stateid = &state->stateid; data->arg.new_lock_owner =1 ; data->res.open_seqid = data->arg.open_seqid;
@@ -4478,10 +4484,15 @@ static void nfs4_lock_prepare(struct rpc_task *task, void *calldata) data->timestamp = jiffies;if (nfs4_setup_sequence (data->server, &data->arg.seq_args, - &data->res.seq_res, task)) + &data->res.seq_res, + task) ==0 ) { +rpc_call_start (task);return ; -rpc_call_start (task); -dprintk ("%s: done!, ret = %d\n" , __func__, data->rpc_status); + } +nfs_release_seqid (data->arg.open_seqid); +out_release_lock_seqid: +nfs_release_seqid (data->arg.lock_seqid); +dprintk ("%s: done!, ret = %d\n" , __func__, task->tk_status); }static void nfs4_recover_lock_prepare (struct rpc_task *task,void *calldata)
fs/nfs/super.c +1 -1
@@ -812,7 +812,7 @@ static int nfs_show_devname(struct seq_file *m, struct dentry *root)int err =0 ;if (!page)return -ENOMEM ; - devname =nfs_path (&dummy, root, page,PAGE_SIZE ); + devname =nfs_path (&dummy, root, page,PAGE_SIZE ,0 );if (IS_ERR (devname)) err =PTR_ERR (devname);else
fs/nfsd/export.c +3 -3
@@ -401,7 +401,7 @@ fsloc_parse(char **mesg, char *buf, struct nfsd4_fs_locations *fsloc)int migrated, i, err;/* listsize */ - err =get_int (mesg, &fsloc->locations_count); + err =get_uint (mesg, &fsloc->locations_count);if (err)return err;if (fsloc->locations_count >MAX_FS_LOCATIONS )
@@ -459,7 +459,7 @@ static int secinfo_parse(char **mesg, char *buf, struct svc_export *exp)return -EINVAL ;for (f = exp->ex_flavors; f < exp->ex_flavors + listsize; f++) { - err =get_int (mesg, &f->pseudoflavor); + err =get_uint (mesg, &f->pseudoflavor);if (err)return err;/*
@@ -468,7 +468,7 @@ static int secinfo_parse(char **mesg, char *buf, struct svc_export *exp)* problem at export time instead of when a client fails * to authenticate. */ - err =get_int (mesg, &f->flags); + err =get_uint (mesg, &f->flags);if (err)return err;/* Only some flags are allowed to differ between flavors: */
fs/xfs/xfs_log_recover.c +1 -1
@@ -3514,7 +3514,7 @@ xlog_do_recovery_pass(* - order is important. */ error =xlog_bread_offset (log,0 , - bblks - split_bblks, hbp, + bblks - split_bblks, dbp, offset +BBTOB (split_bblks));if (error) goto bread_err2;
include/linux/sunrpc/cache.h +16 -0
@@ -228,6 +228,22 @@ static inline int get_int(char **bpp, int *anint)return 0 ; } +static inline int get_uint (char **bpp,unsigned int *anint) +{ +char buf[50 ]; +int len =qword_get (bpp, buf,sizeof (buf)); + +if (len <0 ) +return -EINVAL ; +if (len ==0 ) +return -ENOENT ; + +if (kstrtouint (buf,0 , anint)) +return -EINVAL ; + +return 0 ; +} +/* * timestamps kept in the cache are expressed in seconds * since boot. This is the best for measuring differences in
include/net/cfg80211.h +9 -0
@@ -2480,6 +2480,15 @@ unsigned int ieee80211_get_hdrlen_from_skb(const struct sk_buff *skb); unsigned int __attribute_const__ ieee80211_hdrlen(__le16 fc);/** +* ieee80211_get_mesh_hdrlen - get mesh extension header length +* @meshhdr: the mesh extension header, only the flags field +* (first byte) will be accessed +* Returns the length of the extension header, which is always at +* least 6 bytes and at most 18 if address 5 and 6 are present. +*/ +unsigned int ieee80211_get_mesh_hdrlen (struct ieee80211s_hdr *meshhdr); + +/** * DOC: Data path helpers * * In addition to generic utilities, cfg80211 also offers
include/sound/core.h +3 -0
@@ -132,6 +132,7 @@ struct snd_card {int shutdown;/* this card is going down */ int free_on_last_close;/* free in context of file_release */ wait_queue_head_t shutdown_sleep; +atomic_t refcount;/* refcount for disconnection */ struct device *dev;/* device assigned to this card */ struct device *card_dev;/* cardX object for sysfs */
@@ -189,6 +190,7 @@ struct snd_minor {const struct file_operations *f_ops;/* file operations */ void *private_data;/* private data for f_ops->open */ struct device *dev;/* device for sysfs */ +struct snd_card *card_ptr;/* assigned card instance */ };/* return a device pointer linked to each sound device as a parent */
@@ -295,6 +297,7 @@ int snd_card_info_done(void);int snd_component_add (struct snd_card *card,const char *component);int snd_card_file_add (struct snd_card *card,struct file *file);int snd_card_file_remove (struct snd_card *card,struct file *file); +void snd_card_unref (struct snd_card *card);#define snd_card_set_dev (card, devptr) ((card)->dev = (devptr))
include/trace/events/xen.h +8 -0
@@ -377,6 +377,14 @@ DECLARE_EVENT_CLASS(xen_mmu_pgd,DEFINE_XEN_MMU_PGD_EVENT (xen_mmu_pgd_pin);DEFINE_XEN_MMU_PGD_EVENT (xen_mmu_pgd_unpin); +TRACE_EVENT (xen_mmu_flush_tlb_all, + TP_PROTO(int x), +TP_ARGS (x), +TP_STRUCT__entry (__array (char, x,0 )), +TP_fast_assign ((void )x), +TP_printk ("%s" ,"" ) + ); + TRACE_EVENT(xen_mmu_flush_tlb, TP_PROTO(int x), TP_ARGS(x),
kernel/futex.c +22 -19
73 lines not on this page · raw message
net/core/dev.c +1 -1
@@ -1643,7 +1643,7 @@ static inline int deliver_skb(struct sk_buff *skb,static inline bool skb_loop_sk (struct packet_type *ptype,struct sk_buff *skb) { -if (ptype->af_packet_priv ==NULL ) +if (!ptype->af_packet_priv || !skb->sk)return false;if (ptype->id_match)
net/ipv4/inet_diag.c +4 -1
@@ -875,13 +875,16 @@ static int __inet_diag_dump(struct sk_buff *skb, struct netlink_callback *cb, struct inet_diag_req_v2 *r, struct nlattr *bc) { const struct inet_diag_handler *handler; +int err =0 ; handler =inet_diag_lock_handler (r->sdiag_protocol);if (!IS_ERR (handler)) handler->dump (skb, cb, r, bc); +else + err =PTR_ERR (handler);inet_diag_unlock_handler (handler); -return skb->len; +return err ? : skb->len; }static int inet_diag_dump (struct sk_buff *skb,struct netlink_callback *cb)
net/ipv4/tcp.c +3 -5
@@ -481,14 +481,12 @@ int tcp_ioctl(struct sock *sk, int cmd, unsigned long arg) !tp->urg_data || before(tp->urg_seq, tp->copied_seq) || !before(tp->urg_seq, tp->rcv_nxt)) { -struct sk_buff *skb; answ = tp->rcv_nxt - tp->copied_seq; -/* Subtract 1, if FIN is in queue. */ - skb =skb_peek_tail (&sk->sk_receive_queue); -if (answ && skb) - answ -=tcp_hdr (skb)->fin; +/* Subtract 1, if FIN was received */ +if (answ &&sock_flag (sk,SOCK_DONE )) + answ--; } else answ = tp->urg_seq - tp->copied_seq;release_sock (sk);
net/ipv4/tcp_illinois.c +5 -3
@@ -313,11 +313,13 @@ static void tcp_illinois_info(struct sock *sk, u32 ext, .tcpv_rttcnt = ca->cnt_rtt, .tcpv_minrtt = ca->base_rtt, }; -u64 t = ca->sum_rtt; -do_div (t, ca->cnt_rtt); - info.tcpv_rtt = t; +if (info.tcpv_rttcnt >0 ) { +u64 t = ca->sum_rtt; +do_div (t, info.tcpv_rttcnt); + info.tcpv_rtt = t; + }nla_put (skb,INET_DIAG_VEGASINFO ,sizeof (info), &info); } }
net/ipv6/ndisc.c +1 -2
@@ -593,7 +593,7 @@ static void ndisc_send_unsol_na(struct net_device *dev) {struct inet6_dev *idev;struct inet6_ifaddr *ifa; -struct in6_addr mcaddr; +struct in6_addr mcaddr =IN6ADDR_LINKLOCAL_ALLNODES_INIT ; idev =in6_dev_get (dev);if (!idev)
@@ -601,7 +601,6 @@ static void ndisc_send_unsol_na(struct net_device *dev)read_lock_bh (&idev->lock);list_for_each_entry (ifa, &idev->addr_list, if_list) { -addrconf_addr_solict_mult (&ifa->addr, &mcaddr); ndisc_send_na(dev, NULL, &mcaddr, &ifa->addr, /*router=*/ !!idev->cnf.forwarding, /*solicited=*/ false, /*override=*/ true,
net/ipv6/route.c +2 -2
@@ -203,7 +203,7 @@ static struct dst_ops ip6_dst_blackhole_ops = { };static const u32 ip6_template_metrics[RTAX_MAX ] = { - [RTAX_HOPLIMIT -1 ] =255 , + [RTAX_HOPLIMIT -1 ] =0 , };static struct rt6_info ip6_null_entry_template = {
@@ -1135,7 +1135,7 @@ struct dst_entry *icmp6_dst_alloc(struct net_device *dev, rt->rt6i_dst.addr = fl6->daddr; rt->rt6i_dst.plen =128 ; rt->rt6i_idev = idev; -dst_metric_set (&rt->dst,RTAX_HOPLIMIT ,255 ); +dst_metric_set (&rt->dst,RTAX_HOPLIMIT ,0 );spin_lock_bh (&icmp6_dst_lock); rt->dst.next = icmp6_dst_gc_list;
net/l2tp/l2tp_eth.c +1 -0
@@ -269,6 +269,7 @@ static int l2tp_eth_create(struct net *net, u32 tunnel_id, u32 session_id, u32 p out_del_dev:free_netdev (dev); + spriv->dev =NULL ; out_del_session:l2tp_session_delete (session); out:
net/mac80211/ibss.c +1 -1
@@ -1110,7 +1110,7 @@ int ieee80211_ibss_join(struct ieee80211_sub_if_data *sdata, sdata->u.ibss.state =IEEE80211_IBSS_MLME_SEARCH ; sdata->u.ibss.ibss_join_req = jiffies; -memcpy (sdata->u.ibss.ssid, params->ssid,IEEE80211_MAX_SSID_LEN ); +memcpy (sdata->u.ibss.ssid, params->ssid, params->ssid_len); sdata->u.ibss.ssid_len = params->ssid_len;mutex_unlock (&sdata->u.ibss.mtx);
net/mac80211/rx.c +55 -17
139 lines not on this page · raw message
net/mac80211/util.c +32 -7
@@ -592,13 +592,38 @@ u32 ieee802_11_parse_elems_crc(u8 *start, size_t len,break ; } -if (id !=WLAN_EID_VENDOR_SPECIFIC && - id !=WLAN_EID_QUIET && -test_bit (id, seen_elems)) { - elems->parse_error = true; - left -= elen; - pos += elen; -continue ; +switch (id) { +case WLAN_EID_SSID : +case WLAN_EID_SUPP_RATES : +case WLAN_EID_FH_PARAMS : +case WLAN_EID_DS_PARAMS : +case WLAN_EID_CF_PARAMS : +case WLAN_EID_TIM : +case WLAN_EID_IBSS_PARAMS : +case WLAN_EID_CHALLENGE : +case WLAN_EID_RSN : +case WLAN_EID_ERP_INFO : +case WLAN_EID_EXT_SUPP_RATES : +case WLAN_EID_HT_CAPABILITY : +case WLAN_EID_MESH_ID : +case WLAN_EID_MESH_CONFIG : +case WLAN_EID_PEER_MGMT : +case WLAN_EID_PREQ : +case WLAN_EID_PREP : +case WLAN_EID_PERR : +case WLAN_EID_RANN : +case WLAN_EID_CHANNEL_SWITCH : +case WLAN_EID_EXT_CHANSWITCH_ANN : +case WLAN_EID_COUNTRY : +case WLAN_EID_PWR_CONSTRAINT : +case WLAN_EID_TIMEOUT_INTERVAL : +if (test_bit (id, seen_elems)) { + elems->parse_error = true; + left -= elen; + pos += elen; +continue ; + } +break ; }if (calc_crc && id <64 && (filter & (1ULL << id)))
net/netlink/af_netlink.c +15 -4
@@ -137,6 +137,8 @@ static void netlink_destroy_callback(struct netlink_callback *cb);static DEFINE_RWLOCK (nl_table_lock);static atomic_t nl_table_users =ATOMIC_INIT (0 ); +#define nl_deref_protected (X ) rcu_dereference_protected(X, lockdep_is_held(&nl_table_lock)); +static ATOMIC_NOTIFIER_HEAD (netlink_chain);static inline u32 netlink_group_mask (u32 group)
@@ -332,6 +334,11 @@ netlink_update_listeners(struct sock *sk)struct hlist_node *node;unsigned long mask;unsigned int i; +struct listeners *listeners; + + listeners =nl_deref_protected (tbl->listeners); +if (!listeners) +return ;for (i =0 ; i <NLGRPLONGS (tbl->groups); i++) { mask =0 ;
@@ -339,7 +346,7 @@ netlink_update_listeners(struct sock *sk)if (i <NLGRPLONGS (nlk_sk (sk)->ngroups)) mask |=nlk_sk (sk)->groups[i]; } - tbl->listeners->masks[i] = mask; + listeners->masks[i] = mask; }/* this function is only called with the netlink table "grabbed", which * makes sure updates are visible before bind or setsockopt return. */
@@ -520,7 +527,11 @@ static int netlink_release(struct socket *sock)if (netlink_is_kernel (sk)) {BUG_ON (nl_table[sk->sk_protocol].registered ==0 );if (--nl_table[sk->sk_protocol].registered ==0 ) { -kfree (nl_table[sk->sk_protocol].listeners); +struct listeners *old; + + old =nl_deref_protected (nl_table[sk->sk_protocol].listeners); +RCU_INIT_POINTER (nl_table[sk->sk_protocol].listeners,NULL ); +kfree_rcu (old, rcu); nl_table[sk->sk_protocol].module =NULL ; nl_table[sk->sk_protocol].registered =0 ; }
@@ -950,7 +961,7 @@ int netlink_has_listeners(struct sock *sk, unsigned int group)rcu_read_lock (); listeners =rcu_dereference (nl_table[sk->sk_protocol].listeners); -if (group -1 < nl_table[sk->sk_protocol].groups) +if (listeners && group -1 < nl_table[sk->sk_protocol].groups) res =test_bit (group -1 , listeners->masks);rcu_read_unlock ();
@@ -1582,7 +1593,7 @@ int __netlink_change_ngroups(struct sock *sk, unsigned int groups) new =kzalloc (sizeof (*new) +NLGRPSZ (groups),GFP_ATOMIC );if (!new)return -ENOMEM ; - old =rcu_dereference_protected (tbl->listeners,1 ); + old =nl_deref_protected (tbl->listeners);memcpy (new->masks, old->masks,NLGRPSZ (tbl->groups));rcu_assign_pointer (tbl->listeners, new);
net/sctp/sm_sideeffect.c +2 -1
@@ -1610,8 +1610,9 @@ static int sctp_cmd_interpreter(sctp_event_t event_type, asoc->outqueue.outstanding_bytes; sackh.num_gap_ack_blocks =0 ; sackh.num_dup_tsns =0 ; + chunk->subh.sack_hdr = &sackh;sctp_add_cmd_sf (commands,SCTP_CMD_PROCESS_SACK , -SCTP_SACKH (&sackh)); +SCTP_CHUNK (chunk));break ;case SCTP_CMD_DISCARD_PACKET :
net/wireless/core.c +1 -2
@@ -552,8 +552,7 @@ int wiphy_register(struct wiphy *wiphy)for (i =0 ; i < sband->n_channels; i++) { sband->channels[i].orig_flags = sband->channels[i].flags; - sband->channels[i].orig_mag = - sband->channels[i].max_antenna_gain; + sband->channels[i].orig_mag =INT_MAX ; sband->channels[i].orig_mpwr = sband->channels[i].max_power; sband->channels[i].band = band;
net/wireless/util.c +8 -6
@@ -290,23 +290,21 @@ unsigned int ieee80211_get_hdrlen_from_skb(const struct sk_buff *skb) }EXPORT_SYMBOL (ieee80211_get_hdrlen_from_skb); -static int ieee80211_get_mesh_hdrlen (struct ieee80211s_hdr *meshhdr) +unsigned int ieee80211_get_mesh_hdrlen (struct ieee80211s_hdr *meshhdr) {int ae = meshhdr->flags &MESH_FLAGS_AE ; -/* 7.1.3.5a.2 */ +/* 802.11-2012, 8.2.4.7.3 */ switch (ae) { +default :case 0 :return 6 ;case MESH_FLAGS_AE_A4 :return 12 ;case MESH_FLAGS_AE_A5_A6 :return 18 ; -case (MESH_FLAGS_AE_A4 |MESH_FLAGS_AE_A5_A6 ): -return 24 ; -default : -return 6 ; } } +EXPORT_SYMBOL (ieee80211_get_mesh_hdrlen);int ieee80211_data_to_8023 (struct sk_buff *skb,const u8 *addr,enum nl80211_iftype iftype)
@@ -354,6 +352,8 @@ int ieee80211_data_to_8023(struct sk_buff *skb, const u8 *addr,/* make sure meshdr->flags is on the linear part */ if (!pskb_may_pull (skb, hdrlen +1 ))return -1 ; +if (meshdr->flags &MESH_FLAGS_AE_A4 ) +return -1 ;if (meshdr->flags &MESH_FLAGS_AE_A5_A6 ) { skb_copy_bits(skb, hdrlen + offsetof(struct ieee80211s_hdr, eaddr1),
@@ -378,6 +378,8 @@ int ieee80211_data_to_8023(struct sk_buff *skb, const u8 *addr,/* make sure meshdr->flags is on the linear part */ if (!pskb_may_pull (skb, hdrlen +1 ))return -1 ; +if (meshdr->flags &MESH_FLAGS_AE_A5_A6 ) +return -1 ;if (meshdr->flags &MESH_FLAGS_AE_A4 ) skb_copy_bits(skb, hdrlen + offsetof(struct ieee80211s_hdr, eaddr1),
sound/core/compress_offload.c +7 -2
@@ -102,12 +102,15 @@ static int snd_compr_open(struct inode *inode, struct file *f)if (dirn != compr->direction) {pr_err ("this device doesn't support this direction\n" ); +snd_card_unref (compr->card);return -EINVAL ; } data =kzalloc (sizeof (*data),GFP_KERNEL ); -if (!data) +if (!data) { +snd_card_unref (compr->card);return -ENOMEM ; + } data->stream.ops = compr->ops; data->stream.direction = dirn; data->stream.private_data = compr->private_data;
@@ -115,6 +118,7 @@ static int snd_compr_open(struct inode *inode, struct file *f) runtime =kzalloc (sizeof (*runtime),GFP_KERNEL );if (!runtime) {kfree (data); +snd_card_unref (compr->card);return -ENOMEM ; } runtime->state =SNDRV_PCM_STATE_OPEN ;
@@ -128,7 +132,8 @@ static int snd_compr_open(struct inode *inode, struct file *f)kfree (runtime);kfree (data); } -return ret; +snd_card_unref (compr->card); +return 0 ; }static int snd_compr_free (struct inode *inode,struct file *f)
sound/core/control.c +5 -0
@@ -86,6 +86,7 @@ static int snd_ctl_open(struct inode *inode, struct file *file)write_lock_irqsave (&card->ctl_files_rwlock, flags);list_add_tail (&ctl->list, &card->ctl_files);write_unlock_irqrestore (&card->ctl_files_rwlock, flags); +snd_card_unref (card);return 0 ; __error:
@@ -93,6 +94,8 @@ static int snd_ctl_open(struct inode *inode, struct file *file) __error2:snd_card_file_remove (card, file); __error1: +if (card) +snd_card_unref (card);return err; }
@@ -1433,6 +1436,8 @@ static ssize_t snd_ctl_read(struct file *file, char __user *buffer,spin_unlock_irq (&ctl->read_lock);schedule ();remove_wait_queue (&ctl->change_sleep, &wait); +if (ctl->card->shutdown) +return -ENODEV ;if (signal_pending (current))return -ERESTARTSYS ;spin_lock_irq (&ctl->read_lock);
sound/core/hwdep.c +11 -1
@@ -100,8 +100,10 @@ static int snd_hwdep_open(struct inode *inode, struct file * file)if (hw ==NULL )return -ENODEV ; -if (!try_module_get (hw->card->module)) +if (!try_module_get (hw->card->module)) { +snd_card_unref (hw->card);return -EFAULT ; + }init_waitqueue_entry (&wait, current);add_wait_queue (&hw->open_wait, &wait);
@@ -129,6 +131,10 @@ static int snd_hwdep_open(struct inode *inode, struct file * file)mutex_unlock (&hw->open_mutex);schedule ();mutex_lock (&hw->open_mutex); +if (hw->card->shutdown) { + err = -ENODEV ; +break ; + }if (signal_pending (current)) { err = -ERESTARTSYS ;break ;
@@ -148,6 +154,7 @@ static int snd_hwdep_open(struct inode *inode, struct file * file)mutex_unlock (&hw->open_mutex);if (err <0 )module_put (hw->card->module); +snd_card_unref (hw->card);return err; }
@@ -459,12 +466,15 @@ static int snd_hwdep_dev_disconnect(struct snd_device *device)mutex_unlock (®ister_mutex);return -EINVAL ; } +mutex_lock (&hwdep->open_mutex); +wake_up (&hwdep->open_wait);#ifdef CONFIG_SND_OSSEMUL if (hwdep->ossreg)snd_unregister_oss_device (hwdep->oss_type, hwdep->card, hwdep->device);#endif snd_unregister_device (SNDRV_DEVICE_TYPE_HWDEP , hwdep->card, hwdep->device);list_del_init (&hwdep->list); +mutex_unlock (&hwdep->open_mutex);mutex_unlock (®ister_mutex);return 0 ; }
sound/core/init.c +30 -20
96 lines not on this page · raw message
sound/core/oss/mixer_oss.c +9 -2
@@ -52,14 +52,19 @@ static int snd_mixer_oss_open(struct inode *inode, struct file *file) SNDRV_OSS_DEVICE_TYPE_MIXER);if (card ==NULL )return -ENODEV ; -if (card->mixer_oss ==NULL ) +if (card->mixer_oss ==NULL ) { +snd_card_unref (card);return -ENODEV ; + } err =snd_card_file_add (card, file); -if (err <0 ) +if (err <0 ) { +snd_card_unref (card);return err; + } fmixer =kzalloc (sizeof (*fmixer),GFP_KERNEL );if (fmixer ==NULL ) {snd_card_file_remove (card, file); +snd_card_unref (card);return -ENOMEM ; } fmixer->card = card;
@@ -68,8 +73,10 @@ static int snd_mixer_oss_open(struct inode *inode, struct file *file)if (!try_module_get (card->module)) {kfree (fmixer);snd_card_file_remove (card, file); +snd_card_unref (card);return -EFAULT ; } +snd_card_unref (card);return 0 ; }
sound/core/oss/pcm_oss.c +7 -0
@@ -2441,6 +2441,10 @@ static int snd_pcm_oss_open(struct inode *inode, struct file *file)mutex_unlock (&pcm->open_mutex);schedule ();mutex_lock (&pcm->open_mutex); +if (pcm->card->shutdown) { + err = -ENODEV ; +break ; + }if (signal_pending (current)) { err = -ERESTARTSYS ;break ;
@@ -2450,6 +2454,7 @@ static int snd_pcm_oss_open(struct inode *inode, struct file *file)mutex_unlock (&pcm->open_mutex);if (err <0 ) goto __error; +snd_card_unref (pcm->card);return err; __error:
@@ -2457,6 +2462,8 @@ static int snd_pcm_oss_open(struct inode *inode, struct file *file) __error2:snd_card_file_remove (pcm->card, file); __error1: +if (pcm) +snd_card_unref (pcm->card);return err; }
sound/core/pcm.c +11 -2
@@ -1086,11 +1086,19 @@ static int snd_pcm_dev_disconnect(struct snd_device *device)if (list_empty (&pcm->list)) goto unlock; +mutex_lock (&pcm->open_mutex); +wake_up (&pcm->open_wait);list_del_init (&pcm->list);for (cidx =0 ; cidx <2 ; cidx++) -for (substream = pcm->streams[cidx].substream; substream; substream = substream->next) -if (substream->runtime) +for (substream = pcm->streams[cidx].substream; substream; substream = substream->next) { +snd_pcm_stream_lock_irq (substream); +if (substream->runtime) { substream->runtime->status->state =SNDRV_PCM_STATE_DISCONNECTED ; +wake_up (&substream->runtime->sleep); +wake_up (&substream->runtime->tsleep); + } +snd_pcm_stream_unlock_irq (substream); + }list_for_each_entry (notify, &snd_pcm_notify_list, list) { notify->n_disconnect (pcm); }
@@ -1106,6 +1114,7 @@ static int snd_pcm_dev_disconnect(struct snd_device *device) }snd_unregister_device (devtype, pcm->card, pcm->device); } +mutex_unlock (&pcm->open_mutex); unlock:mutex_unlock (®ister_mutex);return 0 ;
sound/core/pcm_native.c +29 -6
@@ -369,6 +369,14 @@ static int period_to_usecs(struct snd_pcm_runtime *runtime)return usecs; } +static void snd_pcm_set_state (struct snd_pcm_substream *substream,int state) +{ +snd_pcm_stream_lock_irq (substream); +if (substream->runtime->status->state !=SNDRV_PCM_STATE_DISCONNECTED ) + substream->runtime->status->state = state; +snd_pcm_stream_unlock_irq (substream); +} +static int snd_pcm_hw_params (struct snd_pcm_substream *substream,struct snd_pcm_hw_params *params) {
@@ -452,7 +460,7 @@ static int snd_pcm_hw_params(struct snd_pcm_substream *substream, runtime->boundary *=2 ;snd_pcm_timer_resolution_change (substream); - runtime->status->state =SNDRV_PCM_STATE_SETUP ; +snd_pcm_set_state (substream,SNDRV_PCM_STATE_SETUP );if (pm_qos_request_active (&substream->latency_pm_qos_req))pm_qos_remove_request (&substream->latency_pm_qos_req);
@@ -464,7 +472,7 @@ static int snd_pcm_hw_params(struct snd_pcm_substream *substream,/* hardware might be unusable from this time, so we force application to retry to set the correct hardware parameter settings */ - runtime->status->state =SNDRV_PCM_STATE_OPEN ; +snd_pcm_set_state (substream,SNDRV_PCM_STATE_OPEN );if (substream->ops->hw_free !=NULL ) substream->ops->hw_free (substream);return err;
@@ -512,7 +520,7 @@ static int snd_pcm_hw_free(struct snd_pcm_substream *substream)return -EBADFD ;if (substream->ops->hw_free) result = substream->ops->hw_free (substream); - runtime->status->state =SNDRV_PCM_STATE_OPEN ; +snd_pcm_set_state (substream,SNDRV_PCM_STATE_OPEN );pm_qos_remove_request (&substream->latency_pm_qos_req);return result; }
@@ -1320,7 +1328,7 @@ static void snd_pcm_post_prepare(struct snd_pcm_substream *substream, int state) {struct snd_pcm_runtime *runtime = substream->runtime; runtime->control->appl_ptr = runtime->status->hw_ptr; - runtime->status->state =SNDRV_PCM_STATE_PREPARED ; +snd_pcm_set_state (substream,SNDRV_PCM_STATE_PREPARED ); }static struct action_ops snd_pcm_action_prepare = {
@@ -1500,6 +1508,10 @@ static int snd_pcm_drain(struct snd_pcm_substream *substream,down_read (&snd_pcm_link_rwsem);snd_pcm_stream_lock_irq (substream);remove_wait_queue (&to_check->sleep, &wait); +if (card->shutdown) { + result = -ENODEV ; +break ; + }if (tout ==0 ) {if (substream->runtime->status->state ==SNDRV_PCM_STATE_SUSPENDED ) result = -ESTRPIPE ;
@@ -1623,6 +1635,7 @@ static int snd_pcm_link(struct snd_pcm_substream *substream, int fd)write_unlock_irq (&snd_pcm_link_rwlock);up_write (&snd_pcm_link_rwsem); _nolock: +snd_card_unref (substream1->pcm->card);fput (file);if (res <0 )kfree (group);
@@ -2097,7 +2110,10 @@ static int snd_pcm_playback_open(struct inode *inode, struct file *file)return err; pcm =snd_lookup_minor_data (iminor (inode),SNDRV_DEVICE_TYPE_PCM_PLAYBACK ); -return snd_pcm_open (file, pcm,SNDRV_PCM_STREAM_PLAYBACK ); + err =snd_pcm_open (file, pcm,SNDRV_PCM_STREAM_PLAYBACK ); +if (pcm) +snd_card_unref (pcm->card); +return err; }static int snd_pcm_capture_open (struct inode *inode,struct file *file)
@@ -2108,7 +2124,10 @@ static int snd_pcm_capture_open(struct inode *inode, struct file *file)return err; pcm =snd_lookup_minor_data (iminor (inode),SNDRV_DEVICE_TYPE_PCM_CAPTURE ); -return snd_pcm_open (file, pcm,SNDRV_PCM_STREAM_CAPTURE ); + err =snd_pcm_open (file, pcm,SNDRV_PCM_STREAM_CAPTURE ); +if (pcm) +snd_card_unref (pcm->card); +return err; }static int snd_pcm_open (struct file *file,struct snd_pcm *pcm,int stream)
@@ -2145,6 +2164,10 @@ static int snd_pcm_open(struct file *file, struct snd_pcm *pcm, int stream)mutex_unlock (&pcm->open_mutex);schedule ();mutex_lock (&pcm->open_mutex); +if (pcm->card->shutdown) { + err = -ENODEV ; +break ; + }if (signal_pending (current)) { err = -ERESTARTSYS ;break ;
sound/core/rawmidi.c +25 -1
@@ -379,8 +379,10 @@ static int snd_rawmidi_open(struct inode *inode, struct file *file)if (rmidi ==NULL )return -ENODEV ; -if (!try_module_get (rmidi->card->module)) +if (!try_module_get (rmidi->card->module)) { +snd_card_unref (rmidi->card);return -ENXIO ; + }mutex_lock (&rmidi->open_mutex); card = rmidi->card;
@@ -422,6 +424,10 @@ static int snd_rawmidi_open(struct inode *inode, struct file *file)mutex_unlock (&rmidi->open_mutex);schedule ();mutex_lock (&rmidi->open_mutex); +if (rmidi->card->shutdown) { + err = -ENODEV ; +break ; + }if (signal_pending (current)) { err = -ERESTARTSYS ;break ;
@@ -440,6 +446,7 @@ static int snd_rawmidi_open(struct inode *inode, struct file *file)#endif file->private_data = rawmidi_file;mutex_unlock (&rmidi->open_mutex); +snd_card_unref (rmidi->card);return 0 ; __error:
@@ -447,6 +454,7 @@ static int snd_rawmidi_open(struct inode *inode, struct file *file) __error_card:mutex_unlock (&rmidi->open_mutex);module_put (rmidi->card->module); +snd_card_unref (rmidi->card);return err; }
@@ -991,6 +999,8 @@ static ssize_t snd_rawmidi_read(struct file *file, char __user *buf, size_t counspin_unlock_irq (&runtime->lock);schedule ();remove_wait_queue (&runtime->sleep, &wait); +if (rfile->rmidi->card->shutdown) +return -ENODEV ;if (signal_pending (current))return result >0 ? result : -ERESTARTSYS ;if (!runtime->avail)
@@ -1234,6 +1244,8 @@ static ssize_t snd_rawmidi_write(struct file *file, const char __user *buf,spin_unlock_irq (&runtime->lock); timeout =schedule_timeout (30 *HZ );remove_wait_queue (&runtime->sleep, &wait); +if (rfile->rmidi->card->shutdown) +return -ENODEV ;if (signal_pending (current))return result >0 ? result : -ERESTARTSYS ;if (!runtime->avail && !timeout)
@@ -1609,9 +1621,20 @@ static int snd_rawmidi_dev_register(struct snd_device *device)static int snd_rawmidi_dev_disconnect (struct snd_device *device) {struct snd_rawmidi *rmidi = device->device_data; +int dir;mutex_lock (®ister_mutex); +mutex_lock (&rmidi->open_mutex); +wake_up (&rmidi->open_wait);list_del_init (&rmidi->list); +for (dir =0 ; dir <2 ; dir++) { +struct snd_rawmidi_substream *s; +list_for_each_entry (s, &rmidi->streams[dir].substreams, list) { +if (s->runtime) +wake_up (&s->runtime->sleep); + } + } +#ifdef CONFIG_SND_OSSEMUL if (rmidi->ossreg) {if ((int )rmidi->device == midi_map[rmidi->card->number]) {
@@ -1626,6 +1649,7 @@ static int snd_rawmidi_dev_disconnect(struct snd_device *device) }#endif /* CONFIG_SND_OSSEMUL */ snd_unregister_device (SNDRV_DEVICE_TYPE_RAWMIDI , rmidi->card, rmidi->device); +mutex_unlock (&rmidi->open_mutex);mutex_unlock (®ister_mutex);return 0 ; }
sound/core/sound.c +9 -2
@@ -99,6 +99,10 @@ static void snd_request_other(int minor)* * Checks that a minor device with the specified type is registered, and returns * its user data pointer. +* +* This function increments the reference counter of the card instance +* if an associated instance with the given minor number and type is found. +* The caller must call snd_card_unref() appropriately later. */ void *snd_lookup_minor_data (unsigned int minor,int type) {
@@ -109,9 +113,11 @@ void *snd_lookup_minor_data(unsigned int minor, int type)return NULL ;mutex_lock (&sound_mutex); mreg = snd_minors[minor]; -if (mreg && mreg->type == type) +if (mreg && mreg->type == type) { private_data = mreg->private_data; -else +if (private_data && mreg->card_ptr) +atomic_inc (&mreg->card_ptr->refcount); + }else private_data =NULL ;mutex_unlock (&sound_mutex);return private_data;
@@ -276,6 +282,7 @@ int snd_register_device_for_dev(int type, struct snd_card *card, int dev, preg->device = dev; preg->f_ops = f_ops; preg->private_data = private_data; + preg->card_ptr = card;mutex_lock (&sound_mutex);#ifdef CONFIG_SND_DYNAMIC_MINORS minor =snd_find_free_minor (type);
sound/core/sound_oss.c +8 -2
@@ -40,6 +40,9 @@static struct snd_minor *snd_oss_minors[SNDRV_OSS_MINORS ];static DEFINE_MUTEX (sound_oss_mutex); +/* NOTE: This function increments the refcount of the associated card like +* snd_lookup_minor_data(); the caller must call snd_card_unref() appropriately +*/ void *snd_lookup_oss_minor_data (unsigned int minor,int type) {struct snd_minor *mreg;
@@ -49,9 +52,11 @@ void *snd_lookup_oss_minor_data(unsigned int minor, int type)return NULL ;mutex_lock (&sound_oss_mutex); mreg = snd_oss_minors[minor]; -if (mreg && mreg->type == type) +if (mreg && mreg->type == type) { private_data = mreg->private_data; -else +if (private_data && mreg->card_ptr) +atomic_inc (&mreg->card_ptr->refcount); + }else private_data =NULL ;mutex_unlock (&sound_oss_mutex);return private_data;
@@ -123,6 +128,7 @@ int snd_register_oss_device(int type, struct snd_card *card, int dev, preg->device = dev; preg->f_ops = f_ops; preg->private_data = private_data; + preg->card_ptr = card;mutex_lock (&sound_oss_mutex); snd_oss_minors[minor] = preg; minor_unit =SNDRV_MINOR_OSS_DEVICE (minor);
sound/usb/card.c +9 -5
@@ -336,7 +336,7 @@ static int snd_usb_audio_create(struct usb_device *dev, int idx,return -ENOMEM ; } -mutex_init (&chip->shutdown_mutex); +init_rwsem (&chip->shutdown_rwsem); chip->index = idx; chip->dev = dev; chip->card = card;
@@ -555,9 +555,11 @@ static void snd_usb_audio_disconnect(struct usb_device *dev,return ; card = chip->card; -mutex_lock (®ister_mutex); -mutex_lock (&chip->shutdown_mutex); +down_write (&chip->shutdown_rwsem); chip->shutdown =1 ; +up_write (&chip->shutdown_rwsem); + +mutex_lock (®ister_mutex); chip->num_interfaces--;if (chip->num_interfaces <=0 ) {snd_card_disconnect (card);
@@ -574,11 +576,9 @@ static void snd_usb_audio_disconnect(struct usb_device *dev,snd_usb_mixer_disconnect (p); } usb_chip[chip->index] =NULL ; -mutex_unlock (&chip->shutdown_mutex);mutex_unlock (®ister_mutex);snd_card_free_when_closed (card); }else { -mutex_unlock (&chip->shutdown_mutex);mutex_unlock (®ister_mutex); } }
@@ -610,16 +610,20 @@ int snd_usb_autoresume(struct snd_usb_audio *chip) {int err = -ENODEV ; +down_read (&chip->shutdown_rwsem);if (!chip->shutdown && !chip->probing) err =usb_autopm_get_interface (chip->pm_intf); +up_read (&chip->shutdown_rwsem);return err; }void snd_usb_autosuspend (struct snd_usb_audio *chip) { +down_read (&chip->shutdown_rwsem);if (!chip->shutdown && !chip->probing)usb_autopm_put_interface (chip->pm_intf); +up_read (&chip->shutdown_rwsem); }static int usb_audio_suspend (struct usb_interface *intf,pm_message_t message)
sound/usb/card.h +1 -0
@@ -87,6 +87,7 @@ struct snd_usb_substream {struct snd_urb_ctx syncurb[SYNC_URBS ];/* sync urb table */ char *syncbuf;/* sync buffer for all sync URBs */ dma_addr_t sync_dma;/* DMA address of syncbuf */ +unsigned int speed;/* USB_SPEED_XXX */ u64 formats;/* format bitmasks (all or'ed) */ unsigned int num_formats;/* number of supported audio formats (list) */
sound/usb/endpoint.c +6 -3
@@ -148,8 +148,10 @@ void snd_usb_release_substream_urbs(struct snd_usb_substream *subs, int force)int i;/* stop urbs (to be sure) */ -deactivate_urbs (subs, force,1 ); -wait_clear_urbs (subs); +if (!subs->stream->chip->shutdown) { +deactivate_urbs (subs, force,1 ); +wait_clear_urbs (subs); + }for (i =0 ; i <MAX_URBS ; i++)release_urb_ctx (&subs->dataurb[i]);
@@ -895,7 +897,8 @@ void snd_usb_init_substream(struct snd_usb_stream *as, subs->dev = as->chip->dev; subs->txfr_quirk = as->chip->txfr_quirk; subs->ops = audio_urb_ops[stream]; -if (snd_usb_get_speed (subs->dev) >=USB_SPEED_HIGH ) + subs->speed =snd_usb_get_speed (subs->dev); +if (subs->speed >=USB_SPEED_HIGH ) subs->ops.prepare_sync = prepare_capture_sync_urb_hs;snd_usb_set_pcm_ops (as->pcm, stream);
sound/usb/mixer.c +43 -22
117 lines not on this page · raw message
sound/usb/mixer_quirks.c +33 -4
@@ -186,6 +186,11 @@ static int snd_audigy2nx_led_put(struct snd_kcontrol *kcontrol, struct snd_ctl_eif (value >1 )return -EINVAL ; changed = value != mixer->audigy2nx_leds[index]; +down_read (&mixer->chip->shutdown_rwsem); +if (mixer->chip->shutdown) { + err = -ENODEV ; + goto out; + }if (mixer->chip->usb_id ==USB_ID (0x041e ,0x3042 )) err = snd_usb_ctl_msg(mixer->chip->dev, usb_sndctrlpipe(mixer->chip->dev, 0), 0x24,
@@ -202,6 +207,8 @@ static int snd_audigy2nx_led_put(struct snd_kcontrol *kcontrol, struct snd_ctl_eusb_sndctrlpipe (mixer->chip->dev,0 ),0x24 ,USB_DIR_OUT |USB_TYPE_VENDOR |USB_RECIP_OTHER , value, index + 2, NULL, 0); + out: +up_read (&mixer->chip->shutdown_rwsem);if (err <0 )return err; mixer->audigy2nx_leds[index] = value;
@@ -295,11 +302,16 @@ static void snd_audigy2nx_proc_read(struct snd_info_entry *entry,for (i =0 ; jacks[i].name; ++i) {snd_iprintf (buffer,"%s: " , jacks[i].name); - err =snd_usb_ctl_msg (mixer->chip->dev, +down_read (&mixer->chip->shutdown_rwsem); +if (mixer->chip->shutdown) + err =0 ; +else + err =snd_usb_ctl_msg (mixer->chip->dev,usb_rcvctrlpipe (mixer->chip->dev,0 ),UAC_GET_MEM ,USB_DIR_IN |USB_TYPE_CLASS |USB_RECIP_INTERFACE ,0 , jacks[i].unitid <<8 , buf,3 ); +up_read (&mixer->chip->shutdown_rwsem);if (err ==3 && (buf[0 ] ==3 || buf[0 ] ==6 ))snd_iprintf (buffer,"%02x %02x\n" , buf[1 ], buf[2 ]);else
@@ -329,10 +341,15 @@ static int snd_xonar_u1_switch_put(struct snd_kcontrol *kcontrol,else new_status = old_status & ~0x02 ; changed = new_status != old_status; - err =snd_usb_ctl_msg (mixer->chip->dev, +down_read (&mixer->chip->shutdown_rwsem); +if (mixer->chip->shutdown) + err = -ENODEV ; +else + err =snd_usb_ctl_msg (mixer->chip->dev,usb_sndctrlpipe (mixer->chip->dev,0 ),0x08 ,USB_DIR_OUT |USB_TYPE_VENDOR |USB_RECIP_OTHER ,50 ,0 , &new_status,1 ); +up_read (&mixer->chip->shutdown_rwsem);if (err <0 )return err; mixer->xonar_u1_status = new_status;
@@ -371,11 +388,17 @@ static int snd_nativeinstruments_control_get(struct snd_kcontrol *kcontrol,u8 bRequest = (kcontrol->private_value >>16 ) &0xff ;u16 wIndex = kcontrol->private_value &0xffff ;u8 tmp; +int ret; -int ret =usb_control_msg (dev,usb_rcvctrlpipe (dev,0 ), bRequest, +down_read (&mixer->chip->shutdown_rwsem); +if (mixer->chip->shutdown) + ret = -ENODEV ; +else + ret =usb_control_msg (dev,usb_rcvctrlpipe (dev,0 ), bRequest,USB_TYPE_VENDOR |USB_RECIP_DEVICE |USB_DIR_IN ,0 ,cpu_to_le16 (wIndex), &tmp,sizeof (tmp),1000 ); +up_read (&mixer->chip->shutdown_rwsem);if (ret <0 ) { snd_printk(KERN_ERR
@@ -396,11 +419,17 @@ static int snd_nativeinstruments_control_put(struct snd_kcontrol *kcontrol,u8 bRequest = (kcontrol->private_value >>16 ) &0xff ;u16 wIndex = kcontrol->private_value &0xffff ;u16 wValue = ucontrol->value.integer.value[0 ]; +int ret; -int ret =usb_control_msg (dev,usb_sndctrlpipe (dev,0 ), bRequest, +down_read (&mixer->chip->shutdown_rwsem); +if (mixer->chip->shutdown) + ret = -ENODEV ; +else + ret =usb_control_msg (dev,usb_sndctrlpipe (dev,0 ), bRequest,USB_TYPE_VENDOR |USB_RECIP_DEVICE |USB_DIR_OUT ,cpu_to_le16 (wValue),cpu_to_le16 (wIndex),NULL ,0 ,1000 ); +up_read (&mixer->chip->shutdown_rwsem);if (ret <0 ) { snd_printk(KERN_ERR
sound/usb/pcm.c +26 -9
@@ -67,6 +67,8 @@ static snd_pcm_uframes_t snd_usb_pcm_pointer(struct snd_pcm_substream *substreamunsigned int hwptr_done; subs = (struct snd_usb_substream *)substream->runtime->private_data; +if (subs->stream->chip->shutdown) +return SNDRV_PCM_POS_XRUN ;spin_lock (&subs->lock); hwptr_done = subs->hwptr_done; substream->runtime->delay = snd_usb_pcm_delay(subs,
@@ -373,8 +375,14 @@ static int snd_usb_hw_params(struct snd_pcm_substream *substream, changed = subs->cur_audiofmt != fmt || subs->period_bytes !=params_period_bytes (hw_params) || subs->cur_rate != rate; + +down_read (&subs->stream->chip->shutdown_rwsem); +if (subs->stream->chip->shutdown) { + ret = -ENODEV ; + goto unlock; + }if ((ret =set_format (subs, fmt)) <0 ) -return ret; + goto unlock;if (subs->cur_rate != rate) {struct usb_host_interface *alts;
@@ -383,12 +391,11 @@ static int snd_usb_hw_params(struct snd_pcm_substream *substream, alts = &iface->altsetting[fmt->altset_idx]; ret =snd_usb_init_sample_rate (subs->stream->chip, subs->interface, alts, fmt, rate);if (ret <0 ) -return ret; + goto unlock; subs->cur_rate = rate; }if (changed) { -mutex_lock (&subs->stream->chip->shutdown_mutex);/* format changed */ snd_usb_release_substream_urbs (subs,0 );/* influenced: period_bytes, channels, rate, format, */
@@ -396,9 +403,10 @@ static int snd_usb_hw_params(struct snd_pcm_substream *substream,params_rate (hw_params),snd_pcm_format_physical_width (params_format (hw_params)) * params_channels(hw_params)); -mutex_unlock (&subs->stream->chip->shutdown_mutex); } +unlock: +up_read (&subs->stream->chip->shutdown_rwsem);return ret; }
@@ -414,9 +422,9 @@ static int snd_usb_hw_free(struct snd_pcm_substream *substream) subs->cur_audiofmt =NULL ; subs->cur_rate =0 ; subs->period_bytes =0 ; -mutex_lock (&subs->stream->chip->shutdown_mutex); +down_read (&subs->stream->chip->shutdown_rwsem);snd_usb_release_substream_urbs (subs,0 ); -mutex_unlock (&subs->stream->chip->shutdown_mutex); +up_read (&subs->stream->chip->shutdown_rwsem);return snd_pcm_lib_free_vmalloc_buffer (substream); }
@@ -429,12 +437,18 @@ static int snd_usb_pcm_prepare(struct snd_pcm_substream *substream) {struct snd_pcm_runtime *runtime = substream->runtime;struct snd_usb_substream *subs = runtime->private_data; +int ret =0 ;if (! subs->cur_audiofmt) {snd_printk (KERN_ERR "usbaudio: no format is specified!\n" );return -ENXIO ; } +down_read (&subs->stream->chip->shutdown_rwsem); +if (subs->stream->chip->shutdown) { + ret = -ENODEV ; + goto unlock; + }/* some unit conversions in runtime */ subs->maxframesize =bytes_to_frames (runtime, subs->maxpacksize); subs->curframesize =bytes_to_frames (runtime, subs->curpacksize);
@@ -447,7 +461,10 @@ static int snd_usb_pcm_prepare(struct snd_pcm_substream *substream) subs->last_frame_number =0 ; runtime->delay =0 ; -return snd_usb_substream_prepare (subs, runtime); + ret =snd_usb_substream_prepare (subs, runtime); + unlock: +up_read (&subs->stream->chip->shutdown_rwsem); +return ret; } static struct snd_pcm_hardware snd_usb_hardware =
@@ -500,7 +517,7 @@ static int hw_check_valid_format(struct snd_usb_substream *subs,return 0 ; }/* check whether the period time is >= the data packet interval */ -if (snd_usb_get_speed (subs->dev) !=USB_SPEED_FULL ) { +if (subs->speed !=USB_SPEED_FULL ) { ptime =125 * (1 << fp->datainterval);if (ptime > pt->max || (ptime == pt->max && pt->openmax)) {hwc_debug (" > check: ptime %u > max %u\n" , ptime, pt->max);
@@ -778,7 +795,7 @@ static int setup_hw_info(struct snd_pcm_runtime *runtime, struct snd_usb_substrereturn err; param_period_time_if_needed =SNDRV_PCM_HW_PARAM_PERIOD_TIME ; -if (snd_usb_get_speed (subs->dev) ==USB_SPEED_FULL ) +if (subs->speed ==USB_SPEED_FULL )/* full speed devices have fixed data packet interval */ ptmin =1000 ;if (ptmin ==1000 )
sound/usb/proc.c +2 -2
@@ -107,7 +107,7 @@ static void proc_dump_substream_formats(struct snd_usb_substream *subs, struct s }snd_iprintf (buffer,"\n" ); } -if (snd_usb_get_speed (subs->dev) !=USB_SPEED_FULL ) +if (subs->speed !=USB_SPEED_FULL )snd_iprintf (buffer," Data packet interval: %d us\n" ,125 * (1 << fp->datainterval));// snd_iprintf(buffer, " Max Packet Size = %d\n", fp->maxpacksize);
@@ -128,7 +128,7 @@ static void proc_dump_substream_status(struct snd_usb_substream *subs, struct snsnd_iprintf (buffer,"]\n" );snd_iprintf (buffer," Packet Size = %d\n" , subs->curpacksize);snd_iprintf (buffer," Momentary freq = %u Hz (%#x.%04x)\n" , -snd_usb_get_speed (subs->dev) ==USB_SPEED_FULL + subs->speed ==USB_SPEED_FULL ?get_full_speed_hz (subs->freqm) :get_high_speed_hz (subs->freqm), subs->freqm >>16 , subs->freqm &0xffff );
sound/usb/usbaudio.h +1 -1
@@ -36,7 +36,7 @@ struct snd_usb_audio {struct snd_card *card;struct usb_interface *pm_intf;u32 usb_id; -struct mutex shutdown_mutex; +struct rw_semaphore shutdown_rwsem; unsigned int shutdown:1; unsigned int probing:1; unsigned int autosuspended:1;