Linux 4.9.13
Greg KH
maintainerI'm announcing the release of the 4.9.13 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
------------
Documentation/kernel-parameters.txt | 4 + Makefile | 2 arch/x86/platform/goldfish/goldfish.c | 14 +++ drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 4 + drivers/net/ethernet/ti/cpsw.c | 2 drivers/net/vxlan.c | 6 + drivers/net/wireless/realtek/rtlwifi/usb.c | 18 ++++ drivers/platform/goldfish/pdev_bus.c | 13 ++- drivers/tty/serial/msm_serial.c | 1 drivers/usb/serial/ark3116.c | 13 ++- drivers/usb/serial/console.c | 1 drivers/usb/serial/cp210x.c | 2 drivers/usb/serial/ftdi_sio.c | 31 +++++--- drivers/usb/serial/mos7840.c | 4 - drivers/usb/serial/opticon.c | 2 drivers/usb/serial/spcp8x5.c | 8 +- fs/xfs/xfs_iomap.c | 13 +++ include/acpi/platform/acenv.h | 2 include/acpi/platform/acintel.h | 87 ++++++++++++++++++++++++ include/linux/ptr_ring.h | 36 ++++++++- mm/backing-dev.c | 9 +- net/core/neighbour.c | 3 net/dccp/input.c | 3 net/ipv4/ip_sockglue.c | 8 +- net/irda/irqueue.c | 34 ++++----- net/kcm/kcmsock.c | 46 +++++++----- net/llc/llc_conn.c | 3 net/llc/llc_sap.c | 3 net/netfilter/nf_conntrack_helper.c | 39 +++++++--- net/packet/af_packet.c | 72 ++++++++++++------- net/socket.c | 4 - 31 files changed, 365 insertions(+), 122 deletions(-)
Andrey Konovalov (1):
dccp: fix freeing skb too early for IPV6_RECVPKTINFO
Anoob Soman (1):
packet: Do not call fanout_release from atomic contexts
Brian Foster (1):
xfs: clear delalloc and cache on buffered write failure
David S. Miller (1):
irda: Fix lockdep annotations in hashbin_delete().
Eric Dumazet (2):
net/llc: avoid BUG_ON() in skb_orphan()
packet: fix races in fanout_add()
Greg Kroah-Hartman (1):
Linux 4.9.13
Ivan Khoronzhuk (1):
net: ethernet: ti: cpsw: fix cpsw assignment in resume
Javier Martinez Canillas (1):
tty: serial: msm: Fix module autoload
Jiri Kosina (1):
netfilter: nf_ct_helper: warn when not applying default helper assignment
Johan Hovold (8):
USB: serial: mos7840: fix another NULL-deref at open
USB: serial: ftdi_sio: fix modem-status error handling
USB: serial: ftdi_sio: fix extreme low-latency setting
USB: serial: ftdi_sio: fix line-status over-reporting
USB: serial: spcp8x5: fix modem-status handling
USB: serial: opticon: fix CTS retrieval at open
USB: serial: ark3116: fix register-accessor error handling
USB: serial: console: fix uninitialised spinlock
Ken Lin (1):
USB: serial: cp210x: add new IDs for GE Bx50v3 boards
Lv Zheng (1):
ACPICA: Linuxize: Restore and fix Intel compiler build
Marcus Huewe (1):
net: neigh: Fix netevent NETEVENT_DELAY_PROBE_TIME_UPDATE notification
Maxime Jayat (1):
net: socket: fix recvmmsg not returning error from sock_error
Michael S. Tsirkin (1):
ptr_ring: fix race conditions when resizing
Michael Schenk (1):
rtlwifi: rtl_usb: Fix for URB leaking when doing ifconfig up/down
Or Gerlitz (1):
net/mlx5e: Disable preemption when doing TC statistics upcall
Paolo Abeni (2):
vxlan: fix oops in dev_fill_metadata_dst
ip: fix IP_CHECKSUM handling
Tejun Heo (1):
block: fix double-free in the failure path of cgwb_bdi_init()
Thomas Gleixner (2):
x86/platform/goldfish: Prevent unconditional loading
goldfish: Sanitize the broken interrupt handler
WANG Cong (2):
kcm: fix 0-length case for kcm_sendmsg()
kcm: fix a null pointer dereference in kcm_sendmsg()
Greg KH
maintainerDocumentation/kernel-parameters.txt +4 -0
@@ -1391,6 +1391,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted. When zero, profiling data is discarded and associated debugfs files are removed at module unload time. + goldfish [X86] Enable the goldfish android emulator platform. + Don't use this when you are not running on the + android emulator + gpt [EFI] Forces disk with valid GPT signature but invalid Protective MBR to be treated as GPT. If the primary GPT is corrupted, it enables the backup/alternate
Makefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 9 -SUBLEVEL = 12 +SUBLEVEL = 13 EXTRAVERSION = NAME = Roaring Lionus
arch/x86/platform/goldfish/goldfish.c +13 -1
@@ -42,10 +42,22 @@ static struct resource goldfish_pdev_bus_resources[] = { } }; +static bool goldfish_enable__initdata ; + +static int __init goldfish_setup (char *str) +{ + goldfish_enable = true; +return 0 ; +} +__setup ("goldfish" , goldfish_setup); +static int __init goldfish_init (void ) { +if (!goldfish_enable) +return -ENODEV ; +platform_device_register_simple ("goldfish_pdev_bus" ,-1 , - goldfish_pdev_bus_resources,2 ); + goldfish_pdev_bus_resources,2 );return 0 ; }device_initcall (goldfish_init);
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +4 -0
@@ -567,10 +567,14 @@ int mlx5e_stats_flower(struct mlx5e_priv *priv,mlx5_fc_query_cached (counter, &bytes, &packets, &lastuse); +preempt_disable (); +tcf_exts_to_list (f->exts, &actions);list_for_each_entry (a, &actions, list)tcf_action_stats_update (a, bytes, packets, lastuse); +preempt_enable (); +return 0 ; }
drivers/net/ethernet/ti/cpsw.c +1 -1
@@ -2925,7 +2925,7 @@ static int cpsw_resume(struct device *dev) {struct platform_device *pdev =to_platform_device (dev);struct net_device *ndev =platform_get_drvdata (pdev); -struct cpsw_common *cpsw =netdev_priv (ndev); +struct cpsw_common *cpsw =ndev_to_cpsw (ndev);/* Select default pin state */ pinctrl_pm_select_default_state (dev);
drivers/net/vxlan.c +4 -2
@@ -2449,7 +2449,8 @@ static int vxlan_fill_metadata_dst(struct net_device *dev, struct sk_buff *skb)return -EINVAL ; rt =vxlan_get_route (vxlan, skb,0 , info->key.tos, info->key.u.ipv4.dst, - &info->key.u.ipv4.src,NULL , info); + &info->key.u.ipv4.src, + &info->dst_cache, info);if (IS_ERR (rt))return PTR_ERR (rt);ip_rt_put (rt);
@@ -2459,7 +2460,8 @@ static int vxlan_fill_metadata_dst(struct net_device *dev, struct sk_buff *skb) ndst =vxlan6_get_route (vxlan, skb,0 , info->key.tos, info->key.label, &info->key.u.ipv6.dst, - &info->key.u.ipv6.src,NULL , info); + &info->key.u.ipv6.src, + &info->dst_cache, info);if (IS_ERR (ndst))return PTR_ERR (ndst);dst_release (ndst);
drivers/net/wireless/realtek/rtlwifi/usb.c +18 -0
@@ -831,12 +831,30 @@ static void rtl_usb_stop(struct ieee80211_hw *hw)struct rtl_priv *rtlpriv =rtl_priv (hw);struct rtl_hal *rtlhal =rtl_hal (rtl_priv (hw));struct rtl_usb *rtlusb =rtl_usbdev (rtl_usbpriv (hw)); +struct urb *urb;/* should after adapter start and interrupt enable. */ set_hal_stop (rtlhal);cancel_work_sync (&rtlpriv->works.fill_h2c_cmd);/* Enable software */ SET_USB_STOP (rtlusb); + +/* free pre-allocated URBs from rtl_usb_start() */ +usb_kill_anchored_urbs (&rtlusb->rx_submitted); + +tasklet_kill (&rtlusb->rx_work_tasklet); +cancel_work_sync (&rtlpriv->works.lps_change_work); + +flush_workqueue (rtlpriv->works.rtl_wq); + +skb_queue_purge (&rtlusb->rx_queue); + +while ((urb =usb_get_from_anchor (&rtlusb->rx_cleanup_urbs))) { +usb_free_coherent (urb->dev, urb->transfer_buffer_length, + urb->transfer_buffer, urb->transfer_dma); +usb_free_urb (urb); + } + rtlpriv->cfg->ops->hw_disable (hw); }
drivers/platform/goldfish/pdev_bus.c +8 -5
@@ -157,23 +157,26 @@ static int goldfish_new_pdev(void)static irqreturn_t goldfish_pdev_bus_interrupt (int irq,void *dev_id) {irqreturn_t ret =IRQ_NONE ; +while (1 ) {u32 op =readl (pdev_bus_base +PDEV_BUS_OP ); -switch (op) { -case PDEV_BUS_OP_DONE : -return IRQ_NONE ; +switch (op) {case PDEV_BUS_OP_REMOVE_DEV :goldfish_pdev_remove (); + ret =IRQ_HANDLED ;break ;case PDEV_BUS_OP_ADD_DEV :goldfish_new_pdev (); + ret =IRQ_HANDLED ;break ; + +case PDEV_BUS_OP_DONE : +default : +return ret; } - ret =IRQ_HANDLED ; } -return ret; }static int goldfish_pdev_bus_probe (struct platform_device *pdev)
drivers/tty/serial/msm_serial.c +1 -0
@@ -1809,6 +1809,7 @@ static const struct of_device_id msm_match_table[] = { { .compatible = "qcom,msm-uartdm" }, {} }; +MODULE_DEVICE_TABLE (of, msm_match_table);static struct platform_driver msm_platform_driver = { .remove = msm_serial_remove,
drivers/usb/serial/ark3116.c +10 -3
@@ -99,10 +99,17 @@ static int ark3116_read_reg(struct usb_serial *serial,usb_rcvctrlpipe (serial->dev,0 ),0xfe ,0xc0 ,0 , reg, buf, 1, ARK_TIMEOUT); -if (result <0 ) +if (result <1 ) { +dev_err (&serial->interface->dev, +"failed to read register %u: %d\n" , + reg, result); +if (result >=0 ) + result = -EIO ; +return result; -else -return buf[0 ]; + } + +return buf[0 ]; }static inline int calc_divisor (int bps)
drivers/usb/serial/console.c +1 -0
@@ -143,6 +143,7 @@ static int usb_console_setup(struct console *co, char *options) tty->driver = usb_serial_tty_driver; tty->index = co->index;init_ldsem (&tty->ldisc_sem); +spin_lock_init (&tty->files_lock);INIT_LIST_HEAD (&tty->tty_files);kref_get (&tty->driver->kref);__module_get (tty->driver->owner);
drivers/usb/serial/cp210x.c +2 -0
@@ -172,6 +172,8 @@ static const struct usb_device_id id_table[] = { { USB_DEVICE(0x1901, 0x0190) }, /* GE B850 CP2105 Recorder interface */ { USB_DEVICE(0x1901, 0x0193) }, /* GE B650 CP2104 PMC interface */ { USB_DEVICE(0x1901, 0x0194) }, /* GE Healthcare Remote Alarm Box */ + { USB_DEVICE(0x1901, 0x0195) }, /* GE B850/B650/B450 CP2104 DP UART interface */ + { USB_DEVICE(0x1901, 0x0196) }, /* GE B850 CP2105 DP UART interface */ { USB_DEVICE(0x19CF, 0x3000) }, /* Parrot NMEA GPS Flight Recorder */ { USB_DEVICE(0x1ADB, 0x0001) }, /* Schweitzer Engineering C662 Cable */ { USB_DEVICE(0x1B1C, 0x1C00) }, /* Corsair USB Dongle */
drivers/usb/serial/ftdi_sio.c +19 -12
@@ -1807,8 +1807,6 @@ static int ftdi_sio_port_probe(struct usb_serial_port *port)mutex_init (&priv->cfg_lock); - priv->flags =ASYNC_LOW_LATENCY ; -if (quirk && quirk->port_probe) quirk->port_probe (priv);
@@ -2072,6 +2070,20 @@ static int ftdi_process_packet(struct usb_serial_port *port, priv->prev_status = status; } +/* save if the transmitter is empty or not */ +if (packet[1 ] &FTDI_RS_TEMT ) + priv->transmit_empty =1 ; +else + priv->transmit_empty =0 ; + + len -=2 ; +if (!len) +return 0 ;/* status only */ + +/* +* Break and error status must only be processed for packets with +* data payload to avoid over-reporting. +*/ flag =TTY_NORMAL ;if (packet[1 ] &FTDI_RS_ERR_MASK ) {/* Break takes precedence over parity, which takes precedence
@@ -2094,15 +2106,6 @@ static int ftdi_process_packet(struct usb_serial_port *port, } } -/* save if the transmitter is empty or not */ -if (packet[1 ] &FTDI_RS_TEMT ) - priv->transmit_empty =1 ; -else - priv->transmit_empty =0 ; - - len -=2 ; -if (!len) -return 0 ;/* status only */ port->icount.rx += len; ch = packet +2 ;
@@ -2433,8 +2436,12 @@ static int ftdi_get_modem_status(struct usb_serial_port *port,FTDI_SIO_GET_MODEM_STATUS_REQUEST_TYPE ,0 , priv->interface, buf, len, WDR_TIMEOUT); -if (ret <0 ) { + +/* NOTE: We allow short responses and handle that below. */ +if (ret <1 ) {dev_err (&port->dev,"failed to get modem status: %d\n" , ret); +if (ret >=0 ) + ret = -EIO ; ret =usb_translate_errors (ret); goto out; }
drivers/usb/serial/mos7840.c +3 -1
@@ -1024,6 +1024,7 @@ static int mos7840_open(struct tty_struct *tty, struct usb_serial_port *port)* (can't set it up in mos7840_startup as the structures * * were not set up at that time.) */ if (port0->open_ports ==1 ) { +/* FIXME: Buffer never NULL, so URB is not submitted. */ if (serial->port[0 ]->interrupt_in_buffer ==NULL ) {/* set up interrupt urb */ usb_fill_int_urb(serial->port[0]->interrupt_in_urb,
@@ -2119,7 +2120,8 @@ static int mos7840_calc_num_ports(struct usb_serial *serial)static int mos7840_attach (struct usb_serial *serial) {if (serial->num_bulk_in < serial->num_ports || - serial->num_bulk_out < serial->num_ports) { + serial->num_bulk_out < serial->num_ports || + serial->num_interrupt_in <1 ) {dev_err (&serial->interface->dev,"missing endpoints\n" );return -ENODEV ; }
drivers/usb/serial/opticon.c +1 -1
@@ -142,7 +142,7 @@ static int opticon_open(struct tty_struct *tty, struct usb_serial_port *port)usb_clear_halt (port->serial->dev, port->read_urb->pipe); res =usb_serial_generic_open (tty, port); -if (!res) +if (res)return res;/* Request CTS line state, sometimes during opening the current
drivers/usb/serial/spcp8x5.c +7 -1
@@ -232,11 +232,17 @@ static int spcp8x5_get_msr(struct usb_serial_port *port, u8 *status) ret =usb_control_msg (dev,usb_rcvctrlpipe (dev,0 ),GET_UART_STATUS ,GET_UART_STATUS_TYPE ,0 ,GET_UART_STATUS_MSR , buf,1 ,100 ); -if (ret <0 ) +if (ret <1 ) {dev_err (&port->dev,"failed to get modem status: %d\n" , ret); +if (ret >=0 ) + ret = -EIO ; + goto out; + }dev_dbg (&port->dev,"0xc0:0x22:0:6 %d - 0x02%x\n" , ret, *buf); *status = *buf; + ret =0 ; +out:kfree (buf);return ret;
fs/xfs/xfs_iomap.c +12 -1
@@ -1068,7 +1068,15 @@ xfs_file_iomap_end_delalloc(xfs_fileoff_t end_fsb;int error =0 ; - start_fsb =XFS_B_TO_FSB (mp, offset + written); +/* +* start_fsb refers to the first unused block after a short write. If +* nothing was written, round offset down to point at the first block in +* the range. +*/ +if (unlikely (!written)) + start_fsb =XFS_B_TO_FSBT (mp, offset); +else + start_fsb =XFS_B_TO_FSB (mp, offset + written); end_fsb =XFS_B_TO_FSB (mp, offset + length);/*
@@ -1080,6 +1088,9 @@ xfs_file_iomap_end_delalloc(* blocks in the range, they are ours. */ if (start_fsb < end_fsb) { +truncate_pagecache_range (VFS_I (ip),XFS_FSB_TO_B (mp, start_fsb), +XFS_FSB_TO_B (mp, end_fsb) -1 ); +xfs_ilock (ip,XFS_ILOCK_EXCL ); error =xfs_bmap_punch_delalloc_range (ip, start_fsb, end_fsb - start_fsb);
include/acpi/platform/acenv.h +1 -1
@@ -177,7 +177,7 @@#include "acmsvc.h" #elif defined(__INTEL_COMPILER) -#include "acintel.h" +#include <acpi/platform/acintel.h> #endif
include/acpi/platform/acintel.h new file +87 -0
87 lines not on this page · raw message
include/linux/ptr_ring.h +31 -5
@@ -111,6 +111,11 @@ static inline int __ptr_ring_produce(struct ptr_ring *r, void *ptr)return 0 ; } +/* +* Note: resize (below) nests producer lock within consumer lock, so if you +* consume in interrupt or BH context, you must disable interrupts/BH when +* calling this. +*/ static inline int ptr_ring_produce (struct ptr_ring *r,void *ptr) {int ret;
@@ -242,6 +247,11 @@ static inline void *__ptr_ring_consume(struct ptr_ring *r)return ptr; } +/* +* Note: resize (below) nests producer lock within consumer lock, so if you +* call this in interrupt or BH context, you must disable interrupts/BH when +* producing. +*/ static inline void *ptr_ring_consume (struct ptr_ring *r) {void *ptr;
@@ -357,7 +367,7 @@ static inline void **__ptr_ring_swap_queue(struct ptr_ring *r, void **queue,void **old;void *ptr; -while ((ptr =ptr_ring_consume (r))) +while ((ptr =__ptr_ring_consume (r)))if (producer < size) queue[producer++] = ptr;else if (destroy)
@@ -372,6 +382,12 @@ static inline void **__ptr_ring_swap_queue(struct ptr_ring *r, void **queue,return old; } +/* +* Note: producer lock is nested within consumer lock, so if you +* resize you must make sure all uses nest correctly. +* In particular if you consume ring in interrupt or BH context, you must +* disable interrupts/BH when doing so. +*/ static inline int ptr_ring_resize (struct ptr_ring *r,int size,gfp_t gfp,void (*destroy)(void *)) {
@@ -382,17 +398,25 @@ static inline int ptr_ring_resize(struct ptr_ring *r, int size, gfp_t gfp,if (!queue)return -ENOMEM ; -spin_lock_irqsave (&(r)->producer_lock, flags); +spin_lock_irqsave (&(r)->consumer_lock, flags); +spin_lock (&(r)->producer_lock); old =__ptr_ring_swap_queue (r, queue, size, gfp, destroy); -spin_unlock_irqrestore (&(r)->producer_lock, flags); +spin_unlock (&(r)->producer_lock); +spin_unlock_irqrestore (&(r)->consumer_lock, flags);kfree (old);return 0 ; } +/* +* Note: producer lock is nested within consumer lock, so if you +* resize you must make sure all uses nest correctly. +* In particular if you consume ring in interrupt or BH context, you must +* disable interrupts/BH when doing so. +*/ static inline int ptr_ring_resize_multiple (struct ptr_ring **rings,int nrings,int size,gfp_t gfp,void (*destroy)(void *))
@@ -412,10 +436,12 @@ static inline int ptr_ring_resize_multiple(struct ptr_ring **rings, int nrings, }for (i =0 ; i < nrings; ++i) { -spin_lock_irqsave (&(rings[i])->producer_lock, flags); +spin_lock_irqsave (&(rings[i])->consumer_lock, flags); +spin_lock (&(rings[i])->producer_lock); queues[i] =__ptr_ring_swap_queue (rings[i], queues[i], size, gfp, destroy); -spin_unlock_irqrestore (&(rings[i])->producer_lock, flags); +spin_unlock (&(rings[i])->producer_lock); +spin_unlock_irqrestore (&(rings[i])->consumer_lock, flags); }for (i =0 ; i < nrings; ++i)
mm/backing-dev.c +7 -2
@@ -757,15 +757,20 @@ static int cgwb_bdi_init(struct backing_dev_info *bdi)if (!bdi->wb_congested)return -ENOMEM ; +atomic_set (&bdi->wb_congested->refcnt,1 ); + err =wb_init (&bdi->wb, bdi,1 ,GFP_KERNEL );if (err) { -kfree (bdi->wb_congested); +wb_congested_put (bdi->wb_congested);return err; } return 0; } -static void cgwb_bdi_destroy (struct backing_dev_info *bdi) { } +static void cgwb_bdi_destroy (struct backing_dev_info *bdi) +{ +wb_congested_put (bdi->wb_congested); +}#endif /* CONFIG_CGROUP_WRITEBACK */
net/core/neighbour.c +2 -1
@@ -2927,7 +2927,8 @@ static void neigh_proc_update(struct ctl_table *ctl, int write)return ;set_bit (index, p->data_state); -call_netevent_notifiers (NETEVENT_DELAY_PROBE_TIME_UPDATE , p); +if (index ==NEIGH_VAR_DELAY_PROBE_TIME ) +call_netevent_notifiers (NETEVENT_DELAY_PROBE_TIME_UPDATE , p);if (!dev)/* NULL dev means this is default value */ neigh_copy_dflt_parms (net, p, index); }
net/dccp/input.c +2 -1
@@ -606,7 +606,8 @@ int dccp_rcv_state_process(struct sock *sk, struct sk_buff *skb,if (inet_csk (sk)->icsk_af_ops->conn_request (sk, skb) <0 )return 1 ; - goto discard; +consume_skb (skb); +return 0 ; }if (dh->dccph_type ==DCCP_PKT_RESET ) goto discard;
net/ipv4/ip_sockglue.c +4 -4
@@ -105,10 +105,10 @@ static void ip_cmsg_recv_checksum(struct msghdr *msg, struct sk_buff *skb,if (skb->ip_summed !=CHECKSUM_COMPLETE )return ; -if (offset !=0 ) - csum =csum_sub (csum, -csum_partial (skb_transport_header (skb) + tlen, - offset,0 )); +if (offset !=0 ) { +int tend_off =skb_transport_offset (skb) + tlen; + csum =csum_sub (csum,skb_checksum (skb, tend_off, offset,0 )); + }put_cmsg (msg,SOL_IP ,IP_CHECKSUM ,sizeof (__wsum), &csum); }
net/irda/irqueue.c +16 -18
@@ -383,9 +383,6 @@ EXPORT_SYMBOL(hashbin_new);* for deallocating this structure if it's complex. If not the user can * just supply kfree, which should take care of the job. */ -#ifdef CONFIG_LOCKDEP -static int hashbin_lock_depth =0 ; -#endif int hashbin_delete (hashbin_t * hashbin,FREE_FUNC free_func) {irda_queue_t * queue;
@@ -396,22 +393,27 @@ int hashbin_delete( hashbin_t* hashbin, FREE_FUNC free_func) IRDA_ASSERT(hashbin->magic == HB_MAGIC, return -1;);/* Synchronize */ -if ( hashbin->hb_type &HB_LOCK ) { -spin_lock_irqsave_nested (&hashbin->hb_spinlock, flags, - hashbin_lock_depth++); - } +if (hashbin->hb_type &HB_LOCK ) +spin_lock_irqsave (&hashbin->hb_spinlock, flags);/* * Free the entries in the hashbin, TODO: use hashbin_clear when * it has been shown to work */ for (i =0 ; i <HASHBIN_SIZE ; i ++ ) { - queue =dequeue_first ((irda_queue_t **) &hashbin->hb_queue[i]); -while (queue ) { -if (free_func) - (*free_func)(queue); - queue =dequeue_first ( - (irda_queue_t **) &hashbin->hb_queue[i]); +while (1 ) { + queue =dequeue_first ((irda_queue_t **) &hashbin->hb_queue[i]); + +if (!queue) +break ; + +if (free_func) { +if (hashbin->hb_type &HB_LOCK ) +spin_unlock_irqrestore (&hashbin->hb_spinlock, flags); +free_func (queue); +if (hashbin->hb_type &HB_LOCK ) +spin_lock_irqsave (&hashbin->hb_spinlock, flags); + } } }
@@ -420,12 +422,8 @@ int hashbin_delete( hashbin_t* hashbin, FREE_FUNC free_func) hashbin->magic = ~HB_MAGIC ;/* Release lock */ -if ( hashbin->hb_type &HB_LOCK ) { +if (hashbin->hb_type &HB_LOCK )spin_unlock_irqrestore (&hashbin->hb_spinlock, flags); -#ifdef CONFIG_LOCKDEP - hashbin_lock_depth--; -#endif - }/* * Free the hashbin structure
net/kcm/kcmsock.c +26 -20
67 lines not on this page · raw message
net/llc/llc_conn.c +3 -0
@@ -821,7 +821,10 @@ void llc_conn_handler(struct llc_sap *sap, struct sk_buff *skb)* another trick required to cope with how the PROCOM state * machine works. -acme */ +skb_orphan (skb); +sock_hold (sk); skb->sk = sk; + skb->destructor = sock_efree; }if (!sock_owned_by_user (sk))llc_conn_rcv (sk, skb);
net/llc/llc_sap.c +3 -0
@@ -290,7 +290,10 @@ static void llc_sap_rcv(struct llc_sap *sap, struct sk_buff *skb, ev->type =LLC_SAP_EV_TYPE_PDU ; ev->reason =0 ; +skb_orphan (skb); +sock_hold (sk); skb->sk = sk; + skb->destructor = sock_efree;llc_sap_state_process (sap, skb); }
net/netfilter/nf_conntrack_helper.c +26 -13
@@ -188,6 +188,26 @@ nf_ct_helper_ext_add(struct nf_conn *ct, }EXPORT_SYMBOL_GPL (nf_ct_helper_ext_add); +static struct nf_conntrack_helper * +nf_ct_lookup_helper (struct nf_conn *ct,struct net *net) +{ +if (!net->ct.sysctl_auto_assign_helper) { +if (net->ct.auto_assign_helper_warned) +return NULL ; +if (!__nf_ct_helper_find (&ct->tuplehash[IP_CT_DIR_REPLY ].tuple)) +return NULL ; +pr_info ("nf_conntrack: default automatic helper assignment " +"has been turned off for security reasons and CT-based " +" firewall rule not found. Use the iptables CT target " +"to attach helpers instead.\n" ); + net->ct.auto_assign_helper_warned =1 ; +return NULL ; + } + +return __nf_ct_helper_find (&ct->tuplehash[IP_CT_DIR_REPLY ].tuple); +} + +int __nf_ct_try_assign_helper (struct nf_conn *ct,struct nf_conn *tmpl,gfp_t flags) {
@@ -213,21 +233,14 @@ int __nf_ct_try_assign_helper(struct nf_conn *ct, struct nf_conn *tmpl, } help =nfct_help (ct); -if (net->ct.sysctl_auto_assign_helper && helper ==NULL ) { - helper =__nf_ct_helper_find (&ct->tuplehash[IP_CT_DIR_REPLY ].tuple); -if (unlikely (!net->ct.auto_assign_helper_warned && helper)) { -pr_info ("nf_conntrack: automatic helper " -"assignment is deprecated and it will " -"be removed soon. Use the iptables CT target " -"to attach helpers instead.\n" ); - net->ct.auto_assign_helper_warned = true; - } - }if (helper ==NULL ) { -if (help) -RCU_INIT_POINTER (help->helper,NULL ); -return 0 ; + helper =nf_ct_lookup_helper (ct, net); +if (helper ==NULL ) { +if (help) +RCU_INIT_POINTER (help->helper,NULL ); +return 0 ; + } }if (help ==NULL ) {
net/packet/af_packet.c +45 -27
151 lines not on this page · raw message
net/socket.c +3 -1
@@ -2197,8 +2197,10 @@ int __sys_recvmmsg(int fd, struct mmsghdr __user *mmsg, unsigned int vlen,return err; err =sock_error (sock->sk); -if (err) +if (err) { + datagrams = err; goto out_put; + } entry = mmsg; compat_entry = (struct compat_mmsghdr __user *)mmsg;