Linux 4.9.155
Greg KH
maintainerI'm announcing the release of the 4.9.155 kernel.
All users of the 4.9 kernel series must upgrade.
The updated 4.9.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.9.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 arch/arm/mach-cns3xxx/pcie.c | 2 arch/arm64/kernel/hibernate.c | 4 - arch/arm64/kernel/hyp-stub.S | 2 arch/arm64/kernel/kaslr.c | 1 drivers/base/core.c | 2 drivers/mmc/host/sdhci-iproc.c | 5 + drivers/net/ethernet/freescale/ucc_geth.c | 2 drivers/net/ethernet/mellanox/mlx4/fw.c | 75 +++++++++++++--------- drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 19 +---- drivers/net/ipvlan/ipvlan_main.c | 6 - drivers/platform/x86/asus-nb-wmi.c | 3 fs/cifs/connect.c | 53 +++++++++++++++ fs/cifs/smb2pdu.c | 4 - fs/dcache.c | 6 - fs/gfs2/rgrp.c | 2 fs/notify/fsnotify.c | 8 +- fs/read_write.c | 4 - fs/super.c | 30 +++++++- include/linux/kobject.h | 17 ++++ include/linux/netdevice.h | 8 ++ include/net/l3mdev.h | 3 kernel/exit.c | 12 ++- mm/memory-failure.c | 3 mm/migrate.c | 7 +- mm/oom_kill.c | 8 ++ net/ipv4/ip_fragment.c | 2 net/ipv6/af_inet6.c | 3 net/l2tp/l2tp_core.c | 43 ++++++------ net/l2tp/l2tp_core.h | 31 +++++++++ net/l2tp/l2tp_ip.c | 3 net/l2tp/l2tp_ip6.c | 3 net/netrom/nr_timer.c | 20 ++--- net/rose/rose_route.c | 5 + 34 files changed, 292 insertions(+), 106 deletions(-)
Amir Goldstein (1):
fanotify: fix handling of events on child sub-directory
Andreas Gruenbacher (1):
gfs2: Revert "Fix loop in gfs2_rbm_find"
Andrei Vagin (1):
kernel/exit.c: release ptraced tasks before zap_pid_ns_processes
Ard Biesheuvel (1):
arm64: kaslr: ensure randomized quantities are clean also when kaslr is off
Aya Levin (2):
net/mlx4_core: Add masking for a few queries on HCA caps net/mlx5e: Allow MAC invalidation while spoofchk is ON
Benjamin Herrenschmidt (1):
drivers: core: Remove glue dirs from sysfs earlier
Bernard Pidoux (1):
net/rose: fix NULL ax25_cb kernel panic
Cong Wang (1):
netrom: switch to sock timer API
Daniel Borkmann (1):
ipvlan, l3mdev: fix broken l3s mode wrt local routes
Dave Chinner (1):
fs: don't scan the inode cache before SB_BORN is set
David Ahern (1):
ipv6: Consider sk_bound_dev_if when binding a socket to an address
David Hildenbrand (1):
mm: migrate: don't rely on __PageMovable() of newpage after unlocking it
Greg Kroah-Hartman (2):
Fix "net: ipv4: do not handle duplicate fragments as overlapping" Linux 4.9.155
Jacob Wen (2):
l2tp: copy 4 more bytes to linear part if necessary
l2tp: fix reading optional fields of L2TPv3
James Morse (2):
arm64: hyp-stub: Forbid kprobing of the hyp-stub
arm64: hibernate: Clean the __hyp_text to PoC after resume
Jimmy Durand Wesolowski (1):
fs: add the fsnotify call to vfs_iter_write
João Paulo Rechi Vita (2):
platform/x86: asus-nb-wmi: Map 0x35 to KEY_SCREENLOCK
platform/x86: asus-nb-wmi: Drop mapping of 0x33 and 0x34 scan codesKoen Vandeputte (1):
ARM: cns3xxx: Fix writing to wrong PCI config registers after alignment
Lorenzo Bianconi (1):
l2tp: remove l2specific_len dependency in l2tp_core
Mathias Thore (1):
ucc_geth: Reset BQL queue when stopping device
Naoya Horiguchi (1):
mm: hwpoison: use do_send_sig_info() instead of force_sig()
Paulo Alcantara (1):
cifs: Always resolve hostname before reconnecting
Pavel Shilovsky (1):
CIFS: Do not count -ENODATA as failure for query directory
Shakeel Butt (1):
mm, oom: fix use-after-free in oom_kill_process
Stefan Wahren (1):
mmc: sdhci-iproc: handle mmc_of_parse() errors during probe
Waiman Long (1):
fs/dcache: Fix incorrect nr_dentry_unused accounting in shrink_dcache_sb()
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 9 -SUBLEVEL = 154 +SUBLEVEL = 155 EXTRAVERSION = NAME = Roaring Lionus
arch/arm/mach-cns3xxx/pcie.c +1 -1
@@ -83,7 +83,7 @@ static void __iomem *cns3xxx_pci_map_bus(struct pci_bus *bus, }else /* remote PCI bus */ base = cnspci->cfg1_regs + ((busno &0xf ) <<20 ); -return base + (where &0xffc ) + (devfn <<12 ); +return base + where + (devfn <<12 ); } static int cns3xxx_pci_read_config(struct pci_bus *bus, unsigned int devfn,
arch/arm64/kernel/hibernate.c +3 -1
@@ -297,8 +297,10 @@ int swsusp_arch_suspend(void)dcache_clean_range (__idmap_text_start, __idmap_text_end);/* Clean kvm setup code to PoC? */ -if (el2_reset_needed ()) +if (el2_reset_needed ()) {dcache_clean_range (__hyp_idmap_text_start, __hyp_idmap_text_end); +dcache_clean_range (__hyp_text_start, __hyp_text_end); + }/* * Tell the hibernation core that we've just restored
arch/arm64/kernel/hyp-stub.S +2 -0
@@ -28,6 +28,8 @@ #include <asm/virt.h> .text + .pushsection .hyp.text, "ax" + .align 11 ENTRY(__hyp_stub_vectors)
arch/arm64/kernel/kaslr.c +1 -0
@@ -88,6 +88,7 @@ u64 __init kaslr_early_init(u64 dt_phys, u64 modulo_offset)* we end up running with module randomization disabled. */ module_alloc_base = (u64 )_etext -MODULES_VSIZE ; +__flush_dcache_area (&module_alloc_base,sizeof (module_alloc_base));/* * Try to map the FDT early. If this fails, we simply bail,
drivers/base/core.c +2 -0
@@ -862,6 +862,8 @@ static void cleanup_glue_dir(struct device *dev, struct kobject *glue_dir)return ;mutex_lock (&gdp_mutex); +if (!kobject_has_children (glue_dir)) +kobject_del (glue_dir);kobject_put (glue_dir);mutex_unlock (&gdp_mutex); }
drivers/mmc/host/sdhci-iproc.c +4 -1
@@ -242,7 +242,10 @@ static int sdhci_iproc_probe(struct platform_device *pdev) iproc_host->data = iproc_data; -mmc_of_parse (host->mmc); + ret =mmc_of_parse (host->mmc); +if (ret) + goto err; +sdhci_get_of_property (pdev); host->mmc->caps |= iproc_host->data->mmc_caps;
drivers/net/ethernet/freescale/ucc_geth.c +2 -0
@@ -1888,6 +1888,8 @@ static void ucc_geth_free_tx(struct ucc_geth_private *ugeth)u16 i, j;u8 __iomem *bd; +netdev_reset_queue (ugeth->ndev); + ug_info = ugeth->ug_info; uf_info = &ug_info->uf_info;
drivers/net/ethernet/mellanox/mlx4/fw.c +46 -29
111 lines not on this page · raw message
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +6 -13
@@ -1216,14 +1216,6 @@ static int esw_vport_ingress_config(struct mlx5_eswitch *esw,int err =0 ;u8 *smac_v; -if (vport->info.spoofchk && !is_valid_ether_addr (vport->info.mac)) { -mlx5_core_warn (esw->dev, -"vport[%d] configure ingress rules failed, illegal mac with spoofchk\n" , - vport->vport); -return -EPERM ; - - } -esw_vport_cleanup_ingress_rules (esw, vport);if (!vport->info.vlan && !vport->info.qos && !vport->info.spoofchk) {
@@ -1709,13 +1701,10 @@ int mlx5_eswitch_set_vport_mac(struct mlx5_eswitch *esw,mutex_lock (&esw->state_lock); evport = &esw->vports[vport]; -if (evport->info.spoofchk && !is_valid_ether_addr (mac)) { +if (evport->info.spoofchk && !is_valid_ether_addr (mac))mlx5_core_warn (esw->dev, -"MAC invalidation is not allowed when spoofchk is on, vport(%d)\n" , +"Set invalid MAC while spoofchk is on, vport(%d)\n" , vport); - err = -EPERM ; - goto unlock; - } err =mlx5_modify_nic_vport_mac_address (esw->dev, vport, mac);if (err) {
@@ -1859,6 +1848,10 @@ int mlx5_eswitch_set_vport_spoofchk(struct mlx5_eswitch *esw, evport = &esw->vports[vport]; pschk = evport->info.spoofchk; evport->info.spoofchk = spoofchk; +if (pschk && !is_valid_ether_addr (evport->info.mac)) +mlx5_core_warn (esw->dev, +"Spoofchk in set while MAC is invalid, vport(%d)\n" , + evport->vport);if (evport->enabled && esw->mode ==SRIOV_LEGACY ) err =esw_vport_ingress_config (esw, evport);if (err)
drivers/net/ipvlan/ipvlan_main.c +3 -3
@@ -85,12 +85,12 @@ static int ipvlan_set_port_mode(struct ipvl_port *port, u16 nval) err =ipvlan_register_nf_hook ();if (!err) { mdev->l3mdev_ops = &ipvl_l3mdev_ops; - mdev->priv_flags |=IFF_L3MDEV_MASTER ; + mdev->priv_flags |=IFF_L3MDEV_RX_HANDLER ; }else goto fail; }else if (port->mode ==IPVLAN_MODE_L3S ) {/* Old mode was L3S */ - mdev->priv_flags &= ~IFF_L3MDEV_MASTER ; + mdev->priv_flags &= ~IFF_L3MDEV_RX_HANDLER ;ipvlan_unregister_nf_hook (); mdev->l3mdev_ops =NULL ; }
@@ -158,7 +158,7 @@ static void ipvlan_port_destroy(struct net_device *dev) dev->priv_flags &= ~IFF_IPVLAN_MASTER ;if (port->mode ==IPVLAN_MODE_L3S ) { - dev->priv_flags &= ~IFF_L3MDEV_MASTER ; + dev->priv_flags &= ~IFF_L3MDEV_RX_HANDLER ;ipvlan_unregister_nf_hook (); dev->l3mdev_ops =NULL ; }
drivers/platform/x86/asus-nb-wmi.c +1 -2
@@ -477,8 +477,7 @@ static const struct key_entry asus_nb_wmi_keymap[] = { { KE_KEY, 0x30, { KEY_VOLUMEUP } }, { KE_KEY, 0x31, { KEY_VOLUMEDOWN } }, { KE_KEY, 0x32, { KEY_MUTE } }, - { KE_KEY, 0x33, { KEY_DISPLAYTOGGLE } }, /* LCD on */ - { KE_KEY, 0x34, { KEY_DISPLAY_OFF } }, /* LCD off */ + { KE_KEY, 0x35, { KEY_SCREENLOCK } }, { KE_KEY, 0x40, { KEY_PREVIOUSSONG } }, { KE_KEY, 0x41, { KEY_NEXTSONG } }, { KE_KEY, 0x43, { KEY_STOPCD } }, /* Stop/Eject */
fs/cifs/connect.c +53 -0
71 lines not on this page · raw message
fs/cifs/smb2pdu.c +2 -2
@@ -2686,8 +2686,8 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon,if (rc == -ENODATA && rsp->hdr.Status ==STATUS_NO_MORE_FILES ) { srch_inf->endOfSearch = true; rc =0 ; - } -cifs_stats_fail_inc (tcon,SMB2_QUERY_DIRECTORY_HE ); + }else +cifs_stats_fail_inc (tcon,SMB2_QUERY_DIRECTORY_HE ); goto qdir_exit; }
fs/dcache.c +1 -5
@@ -1164,15 +1164,11 @@ static enum lru_status dentry_lru_isolate_shrink(struct list_head *item,*/ void shrink_dcache_sb (struct super_block *sb) { -long freed; -do {LIST_HEAD (dispose); - freed =list_lru_walk (&sb->s_dentry_lru, +list_lru_walk (&sb->s_dentry_lru, dentry_lru_isolate_shrink, &dispose,1024 ); - -this_cpu_sub (nr_dentry_unused, freed);shrink_dentry_list (&dispose);cond_resched (); }while (list_lru_count (&sb->s_dentry_lru) >0 );
fs/gfs2/rgrp.c +1 -1
@@ -1705,9 +1705,9 @@ static int gfs2_rbm_find(struct gfs2_rbm *rbm, u8 state, u32 *minext, goto next_iter; }if (ret == -E2BIG ) { - n += rbm->bii - initial_bii; rbm->bii =0 ; rbm->offset =0 ; + n += (rbm->bii - initial_bii); goto res_covered_end_of_rgrp; }return ret;
fs/notify/fsnotify.c +6 -2
@@ -101,9 +101,9 @@ int __fsnotify_parent(struct path *path, struct dentry *dentry, __u32 mask) parent =dget_parent (dentry); p_inode = parent->d_inode; -if (unlikely (!fsnotify_inode_watches_children (p_inode))) +if (unlikely (!fsnotify_inode_watches_children (p_inode))) {__fsnotify_update_child_dentry_flags (p_inode); -else if (p_inode->i_fsnotify_mask & mask) { + }else if (p_inode->i_fsnotify_mask & mask & ~FS_EVENT_ON_CHILD ) {struct name_snapshot name;/* we are notifying a parent so come up with the new mask which
@@ -207,6 +207,10 @@ int fsnotify(struct inode *to_tell, __u32 mask, void *data, int data_is,else mnt =NULL ; +/* An event "on child" is not intended for a mount mark */ +if (mask &FS_EVENT_ON_CHILD ) + mnt =NULL ; +/* * Optimization: srcu_read_lock() has a memory barrier which can * be expensive. It protects walking the *_fsnotify_marks lists.
fs/read_write.c +3 -1
@@ -392,8 +392,10 @@ ssize_t vfs_iter_write(struct file *file, struct iov_iter *iter, loff_t *ppos) iter->type |=WRITE ; ret = file->f_op->write_iter (&kiocb, iter);BUG_ON (ret == -EIOCBQUEUED ); -if (ret >0 ) +if (ret >0 ) { *ppos = kiocb.ki_pos; +fsnotify_modify (file); + }return ret; }EXPORT_SYMBOL (vfs_iter_write);
fs/super.c +24 -6
@@ -119,13 +119,23 @@ static unsigned long super_cache_count(struct shrinker *shrink, sb = container_of(shrink, struct super_block, s_shrink);/* -* Don't call trylock_super as it is a potential -* scalability bottleneck. The counts could get updated -* between super_cache_count and super_cache_scan anyway. -* Call to super_cache_count with shrinker_rwsem held -* ensures the safety of call to list_lru_shrink_count() and -* s_op->nr_cached_objects(). +* We don't call trylock_super() here as it is a scalability bottleneck, +* so we're exposed to partial setup state. The shrinker rwsem does not +* protect filesystem operations backing list_lru_shrink_count() or +* s_op->nr_cached_objects(). Counts can change between +* super_cache_count and super_cache_scan, so we really don't need locks +* here. +* +* However, if we are currently mounting the superblock, the underlying +* filesystem might be in a state of partial construction and hence it +* is dangerous to access it. trylock_super() uses a MS_BORN check to +* avoid this situation, so do the same here. The memory barrier is +* matched with the one in mount_fs() as we don't hold locks here. */ +if (!(sb->s_flags &MS_BORN )) +return 0 ; +smp_rmb (); +if (sb->s_op && sb->s_op->nr_cached_objects) total_objects = sb->s_op->nr_cached_objects (sb, sc);
@@ -1193,6 +1203,14 @@ mount_fs(struct file_system_type *type, int flags, const char *name, void *data) sb = root->d_sb;BUG_ON (!sb);WARN_ON (!sb->s_bdi); + +/* +* Write barrier is for super_cache_count(). We place it before setting +* MS_BORN as the data dependency between the two functions is the +* superblock structure contents that we just set up, not the MS_BORN +* flag. +*/ +smp_wmb (); sb->s_flags |=MS_BORN ; error =security_sb_kern_mount (sb, flags, secdata);
include/linux/kobject.h +17 -0
@@ -113,6 +113,23 @@ extern void kobject_put(struct kobject *kobj);extern const void *kobject_namespace (struct kobject *kobj);extern char *kobject_get_path (struct kobject *kobj,gfp_t flag); +/** +* kobject_has_children - Returns whether a kobject has children. +* @kobj: the object to test +* +* This will return whether a kobject has other kobjects as children. +* +* It does NOT account for the presence of attribute files, only sub +* directories. It also assumes there is no concurrent addition or +* removal of such children, and thus relies on external locking. +*/ +static inline bool kobject_has_children (struct kobject *kobj) +{ +WARN_ON_ONCE (atomic_read (&kobj->kref.refcount) ==0 ); + +return kobj->sd && kobj->sd->dir.subdirs; +} +struct kobj_type {void (*release)(struct kobject *kobj);const struct sysfs_ops *sysfs_ops;
include/linux/netdevice.h +8 -0
@@ -1368,6 +1368,7 @@ struct net_device_ops {* @IFF_PHONY_HEADROOM: the headroom value is controlled by an external * entity (i.e. the master device for bridged veth) * @IFF_MACSEC: device is a MACsec device +* @IFF_L3MDEV_RX_HANDLER: only invoke the rx handler of L3 master device */ enum netdev_priv_flags {IFF_802_1Q_VLAN =1 <<0 ,
@@ -1398,6 +1399,7 @@ enum netdev_priv_flags {IFF_RXFH_CONFIGURED =1 <<25 ,IFF_PHONY_HEADROOM =1 <<26 ,IFF_MACSEC =1 <<27 , + IFF_L3MDEV_RX_HANDLER = 1<<28, };#define IFF_802_1Q_VLAN IFF_802_1Q_VLAN
@@ -1427,6 +1429,7 @@ enum netdev_priv_flags {#define IFF_TEAM IFF_TEAM#define IFF_RXFH_CONFIGURED IFF_RXFH_CONFIGURED#define IFF_MACSEC IFF_MACSEC +#define IFF_L3MDEV_RX_HANDLER IFF_L3MDEV_RX_HANDLER/** * struct net_device - The DEVICE structure.
@@ -4244,6 +4247,11 @@ static inline bool netif_supports_nofcs(struct net_device *dev)return dev->priv_flags &IFF_SUPP_NOFCS ; } +static inline bool netif_has_l3_rx_handler (const struct net_device *dev) +{ +return dev->priv_flags &IFF_L3MDEV_RX_HANDLER ; +} +static inline bool netif_is_l3_master (const struct net_device *dev) {return dev->priv_flags &IFF_L3MDEV_MASTER ;
include/net/l3mdev.h +2 -1
@@ -142,7 +142,8 @@ struct sk_buff *l3mdev_l3_rcv(struct sk_buff *skb, u16 proto)if (netif_is_l3_slave (skb->dev)) master =netdev_master_upper_dev_get_rcu (skb->dev); -else if (netif_is_l3_master (skb->dev)) +else if (netif_is_l3_master (skb->dev) || +netif_has_l3_rx_handler (skb->dev)) master = skb->dev;if (master && master->l3mdev_ops->l3mdev_l3_rcv)
kernel/exit.c +10 -2
@@ -525,12 +525,14 @@ static struct task_struct *find_alive_thread(struct task_struct *p)return NULL ; } -static struct task_struct *find_child_reaper (struct task_struct *father) +static struct task_struct *find_child_reaper (struct task_struct *father, +struct list_head *dead) __releases(&tasklist_lock) __acquires(&tasklist_lock) {struct pid_namespace *pid_ns =task_active_pid_ns (father);struct task_struct *reaper = pid_ns->child_reaper; +struct task_struct *p, *n;if (likely (reaper != father))return reaper;
@@ -546,6 +548,12 @@ static struct task_struct *find_child_reaper(struct task_struct *father)panic ("Attempted to kill init! exitcode=0x%08x\n" , father->signal->group_exit_code ?: father->exit_code); } + +list_for_each_entry_safe (p, n, dead, ptrace_entry) { +list_del_init (&p->ptrace_entry); +release_task (p); + } +zap_pid_ns_processes (pid_ns);write_lock_irq (&tasklist_lock);
@@ -632,7 +640,7 @@ static void forget_original_parent(struct task_struct *father,exit_ptrace (father, dead);/* Can drop and reacquire tasklist_lock */ - reaper =find_child_reaper (father); + reaper =find_child_reaper (father, dead);if (list_empty (&father->children))return ;
mm/memory-failure.c +2 -1
@@ -336,7 +336,8 @@ static void kill_procs(struct list_head *to_kill, int forcekill, int trapno,if (fail || tk->addr_valid ==0 ) {pr_err ("Memory failure: %#lx: forcibly killing %s:%d because of failure to unmap corrupted page\n" , pfn, tk->tsk->comm, tk->tsk->pid); -force_sig (SIGKILL , tk->tsk); +do_send_sig_info (SIGKILL ,SEND_SIG_PRIV , + tk->tsk,PIDTYPE_PID ); }/*
mm/migrate.c +5 -2
@@ -1044,10 +1044,13 @@ static int __unmap_and_move(struct page *page, struct page *newpage,* If migration is successful, decrease refcount of the newpage * which will not free the page because new page owner increased * refcounter. As well, if it is LRU page, add the page to LRU -* list in here. +* list in here. Use the old state of the isolated source page to +* determine if we migrated a LRU page. newpage was already unlocked +* and possibly modified by its owner - don't rely on the page +* state. */ if (rc ==MIGRATEPAGE_SUCCESS ) { -if (unlikely (__PageMovable (newpage))) +if (unlikely (!is_lru))put_page (newpage);else putback_lru_page (newpage);
mm/oom_kill.c +8 -0
@@ -861,6 +861,13 @@ static void oom_kill_process(struct oom_control *oc, const char *message)* still freeing memory. */ read_lock (&tasklist_lock); + +/* +* The task 'p' might have already exited before reaching here. The +* put_task_struct() will free task_struct 'p' while the loop still try +* to access the field of 'p', so, get an extra reference. +*/ +get_task_struct (p);for_each_thread (p, t) {list_for_each_entry (child, &t->children, sibling) {unsigned int child_points;
@@ -880,6 +887,7 @@ static void oom_kill_process(struct oom_control *oc, const char *message) } } } +put_task_struct (p);read_unlock (&tasklist_lock); p =find_lock_task_mm (victim);
net/ipv4/ip_fragment.c +1 -1
@@ -423,6 +423,7 @@ static int ip_frag_queue(struct ipq *qp, struct sk_buff *skb)* fragment. */ + err = -EINVAL ;/* Find out where to put this fragment. */ prev_tail = qp->q.fragments_tail;if (!prev_tail)
@@ -499,7 +500,6 @@ static int ip_frag_queue(struct ipq *qp, struct sk_buff *skb) discard_qp:inet_frag_kill (&qp->q); - err = -EINVAL ;__IP_INC_STATS (net,IPSTATS_MIB_REASM_OVERLAPS ); err:kfree_skb (skb);
net/ipv6/af_inet6.c +3 -0
@@ -359,6 +359,9 @@ int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) err = -EINVAL ; goto out_unlock; } + } + +if (sk->sk_bound_dev_if) { dev =dev_get_by_index_rcu (net, sk->sk_bound_dev_if);if (!dev) { err = -ENODEV ;
net/l2tp/l2tp_core.c +22 -21
89 lines not on this page · raw message
net/l2tp/l2tp_core.h +31 -0
@@ -314,6 +314,37 @@ do { \#define l2tp_session_dec_refcount (s) l2tp_session_dec_refcount_1(s)#endif +static inline int l2tp_get_l2specific_len (struct l2tp_session *session) +{ +switch (session->l2specific_type) { +case L2TP_L2SPECTYPE_DEFAULT : +return 4 ; +case L2TP_L2SPECTYPE_NONE : +default : +return 0 ; + } +} + +static inline int l2tp_v3_ensure_opt_in_linear (struct l2tp_session *session,struct sk_buff *skb, +unsigned char **ptr,unsigned char **optr) +{ +int opt_len = session->peer_cookie_len +l2tp_get_l2specific_len (session); + +if (opt_len >0 ) { +int off = *ptr - *optr; + +if (!pskb_may_pull (skb, off + opt_len)) +return -1 ; + +if (skb->data != *optr) { + *optr = skb->data; + *ptr = skb->data + off; + } + } + +return 0 ; +} +#define l2tp_printk (ptr, type, func, fmt, ...) \ do { \ if (((ptr)->debug) & (type)) \
net/l2tp/l2tp_ip.c +3 -0
@@ -157,6 +157,9 @@ static int l2tp_ip_recv(struct sk_buff *skb)print_hex_dump_bytes ("" ,DUMP_PREFIX_OFFSET , ptr, length); } +if (l2tp_v3_ensure_opt_in_linear (session, skb, &ptr, &optr)) + goto discard_sess; +l2tp_recv_common (session, skb, ptr, optr,0 , skb->len, tunnel->recv_payload_hook);l2tp_session_dec_refcount (session);
net/l2tp/l2tp_ip6.c +3 -0
@@ -169,6 +169,9 @@ static int l2tp_ip6_recv(struct sk_buff *skb)print_hex_dump_bytes ("" ,DUMP_PREFIX_OFFSET , ptr, length); } +if (l2tp_v3_ensure_opt_in_linear (session, skb, &ptr, &optr)) + goto discard_sess; +l2tp_recv_common (session, skb, ptr, optr,0 , skb->len, tunnel->recv_payload_hook);l2tp_session_dec_refcount (session);
net/netrom/nr_timer.c +10 -10
@@ -53,21 +53,21 @@ void nr_start_t1timer(struct sock *sk) {struct nr_sock *nr =nr_sk (sk); -mod_timer (&nr->t1timer, jiffies + nr->t1); +sk_reset_timer (sk, &nr->t1timer, jiffies + nr->t1); }void nr_start_t2timer (struct sock *sk) {struct nr_sock *nr =nr_sk (sk); -mod_timer (&nr->t2timer, jiffies + nr->t2); +sk_reset_timer (sk, &nr->t2timer, jiffies + nr->t2); }void nr_start_t4timer (struct sock *sk) {struct nr_sock *nr =nr_sk (sk); -mod_timer (&nr->t4timer, jiffies + nr->t4); +sk_reset_timer (sk, &nr->t4timer, jiffies + nr->t4); }void nr_start_idletimer (struct sock *sk)
@@ -75,37 +75,37 @@ void nr_start_idletimer(struct sock *sk)struct nr_sock *nr =nr_sk (sk);if (nr->idle >0 ) -mod_timer (&nr->idletimer, jiffies + nr->idle); +sk_reset_timer (sk, &nr->idletimer, jiffies + nr->idle); }void nr_start_heartbeat (struct sock *sk) { -mod_timer (&sk->sk_timer, jiffies +5 *HZ ); +sk_reset_timer (sk, &sk->sk_timer, jiffies +5 *HZ ); }void nr_stop_t1timer (struct sock *sk) { -del_timer (&nr_sk (sk)->t1timer); +sk_stop_timer (sk, &nr_sk (sk)->t1timer); }void nr_stop_t2timer (struct sock *sk) { -del_timer (&nr_sk (sk)->t2timer); +sk_stop_timer (sk, &nr_sk (sk)->t2timer); }void nr_stop_t4timer (struct sock *sk) { -del_timer (&nr_sk (sk)->t4timer); +sk_stop_timer (sk, &nr_sk (sk)->t4timer); }void nr_stop_idletimer (struct sock *sk) { -del_timer (&nr_sk (sk)->idletimer); +sk_stop_timer (sk, &nr_sk (sk)->idletimer); }void nr_stop_heartbeat (struct sock *sk) { -del_timer (&sk->sk_timer); +sk_stop_timer (sk, &sk->sk_timer); }int nr_t1timer_running (struct sock *sk)
net/rose/rose_route.c +5 -0
@@ -848,6 +848,7 @@ void rose_link_device_down(struct net_device *dev)/* * Route a frame to an appropriate AX.25 connection. +* A NULL ax25_cb indicates an internally generated frame. */ int rose_route_frame (struct sk_buff *skb,ax25_cb *ax25) {
@@ -865,6 +866,10 @@ int rose_route_frame(struct sk_buff *skb, ax25_cb *ax25)if (skb->len <ROSE_MIN_LEN )return res; + +if (!ax25) +return rose_loopback_queue (skb,NULL ); + frametype = skb->data[2 ]; lci = ((skb->data[0 ] <<8 ) &0xF00 ) + ((skb->data[1 ] <<0 ) &0x0FF ); if (frametype == ROSE_CALL_REQUEST &&