Linux 4.4.65
Greg KH
maintainerI'm announcing the release of the 4.4.65 kernel.
All users of the 4.4 kernel series must upgrade.
The updated 4.4.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.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
------------
Documentation/sysctl/fs.txt | 7 +++ Makefile | 2 - drivers/media/tuners/tuner-xc2028.c | 3 + drivers/net/wireless/hostap/hostap_hw.c | 15 +++++--- drivers/staging/android/ion/ion.c | 55 +++++++++++++++++++++++------- drivers/tty/nozomi.c | 2 - drivers/vfio/pci/vfio_pci.c | 33 +++++++++++------- drivers/vfio/pci/vfio_pci_intrs.c | 2 - fs/gfs2/dir.c | 4 +- fs/mount.h | 2 + fs/namespace.c | 50 +++++++++++++++++++++++++++- fs/pnode.c | 2 - fs/pnode.h | 1 include/linux/mount.h | 2 + kernel/events/core.c | 57 +++++++++++++++++++++++++++++--- kernel/sysctl.c | 9 +++++ net/ipv4/ping.c | 5 +- net/netfilter/nfnetlink.c | 10 +++-- net/tipc/bearer.c | 13 ++++++- net/tipc/bearer.h | 13 +++++++ net/tipc/core.c | 1 net/tipc/core.h | 3 + net/tipc/name_distr.c | 24 ++++++------- net/tipc/node.c | 4 +- net/tipc/socket.c | 56 ++++++++++++++++++++++++------- net/tipc/udp_media.c | 7 +++ 26 files changed, 304 insertions(+), 78 deletions(-)
Arnd Bergmann (3):
tty: nozomi: avoid a harmless gcc warning
hostap: avoid uninitialized variable use in hfa384x_get_rid
gfs2: avoid uninitialized variable warning
Eric Dumazet (1):
ping: implement proper locking
Eric W. Biederman (1):
mnt: Add a per mount namespace limit on the number of mounts
Erik Hugne (1):
tipc: make dist queue pernet
EunTaik Lee (1):
staging/android/ion : fix a race condition in the ion driver
Greg Kroah-Hartman (1):
Linux 4.4.65
Jon Paul Maloy (3):
tipc: re-enable compensation for socket receive buffer double counting
tipc: correct error in node fsm
tipc: fix socket timer deadlock
Mauro Carvalho Chehab (1):
xc2028: avoid use after free
Michal Kubeček (1):
tipc: check minimum bearer MTU
Parthasarathy Bhuvaragan (1):
tipc: fix random link resets while adding a second bearer
Peter Zijlstra (1):
perf/core: Fix concurrent sys_perf_event_open() vs. 'move_group' race
Phil Turnbull (1):
netfilter: nfnetlink: correctly validate length of batch messages
Richard Alpe (1):
tipc: make sure IPv6 header fits in skb headroom
Vlad Tsyrklevich (1):
vfio/pci: Fix integer overflows, bitmask check
Greg KH
maintainerDocumentation/sysctl/fs.txt +7 -0
@@ -265,6 +265,13 @@ aio-nr can grow to. ============================================================== +mount-max: + +This denotes the maximum number of mounts that may exist +in a mount namespace. + +============================================================== + 2. /proc/sys/fs/binfmt_misc ----------------------------------------------------------
Makefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 4 -SUBLEVEL = 64 +SUBLEVEL = 65 EXTRAVERSION = NAME = Blurry Fish Butt
drivers/media/tuners/tuner-xc2028.c +2 -1
@@ -1403,11 +1403,12 @@ static int xc2028_set_config(struct dvb_frontend *fe, void *priv_cfg)* in order to avoid troubles during device release. */ kfree (priv->ctrl.fname); + priv->ctrl.fname =NULL ;memcpy (&priv->ctrl, p,sizeof (priv->ctrl));if (p->fname) { priv->ctrl.fname =kstrdup (p->fname,GFP_KERNEL );if (priv->ctrl.fname ==NULL ) - rc = -ENOMEM ; +return -ENOMEM ; }/*
drivers/net/wireless/hostap/hostap_hw.c +10 -5
@@ -836,25 +836,30 @@ static int hfa384x_get_rid(struct net_device *dev, u16 rid, void *buf, int len,spin_lock_bh (&local->baplock); res =hfa384x_setup_bap (dev,BAP0 , rid,0 ); -if (!res) - res =hfa384x_from_bap (dev,BAP0 , &rec,sizeof (rec)); +if (res) + goto unlock; + + res =hfa384x_from_bap (dev,BAP0 , &rec,sizeof (rec)); +if (res) + goto unlock;if (le16_to_cpu (rec.len) ==0 ) {/* RID not available */ res = -ENODATA ; + goto unlock; } rlen = (le16_to_cpu (rec.len) -1 ) *2 ; -if (!res && exact_len && rlen != len) { +if (exact_len && rlen != len) {printk (KERN_DEBUG "%s: hfa384x_get_rid - RID len mismatch: " "rid=0x%04x, len=%d (expected %d)\n" , dev->name, rid, rlen, len); res = -ENODATA ; } -if (!res) - res =hfa384x_from_bap (dev,BAP0 , buf, len); + res =hfa384x_from_bap (dev,BAP0 , buf, len); +unlock:spin_unlock_bh (&local->baplock);mutex_unlock (&local->rid_bap_mtx);
drivers/staging/android/ion/ion.c +42 -13
108 lines not on this page · raw message
drivers/tty/nozomi.c +1 -1
@@ -823,7 +823,7 @@ static int receive_data(enum port_type index, struct nozomi *dc)struct tty_struct *tty =tty_port_tty_get (&port->port);int i, ret; -read_mem32 ((u32 *) &size, addr,4 ); + size =__le32_to_cpu (readl (addr));/* DBG1( "%d bytes port: %d", size, index); */ if (tty &&test_bit (TTY_THROTTLED , &tty->flags)) {
drivers/vfio/pci/vfio_pci.c +21 -12
@@ -562,8 +562,9 @@ static long vfio_pci_ioctl(void *device_data, }else if (cmd ==VFIO_DEVICE_SET_IRQS ) {struct vfio_irq_set hdr; +size_t size;u8 *data =NULL ; -int ret =0 ; +int max, ret =0 ; minsz = offsetofend(struct vfio_irq_set, count);
@@ -571,23 +572,31 @@ static long vfio_pci_ioctl(void *device_data,return -EFAULT ;if (hdr.argsz < minsz || hdr.index >=VFIO_PCI_NUM_IRQS || + hdr.count >= (U32_MAX - hdr.start) || hdr.flags & ~(VFIO_IRQ_SET_DATA_TYPE_MASK |VFIO_IRQ_SET_ACTION_TYPE_MASK ))return -EINVAL ; -if (!(hdr.flags &VFIO_IRQ_SET_DATA_NONE )) { -size_t size; -int max =vfio_pci_get_irq_count (vdev, hdr.index); + max =vfio_pci_get_irq_count (vdev, hdr.index); +if (hdr.start >= max || hdr.start + hdr.count > max) +return -EINVAL ; -if (hdr.flags &VFIO_IRQ_SET_DATA_BOOL ) - size =sizeof (uint8_t ); -else if (hdr.flags &VFIO_IRQ_SET_DATA_EVENTFD ) - size =sizeof (int32_t ); -else -return -EINVAL ; +switch (hdr.flags &VFIO_IRQ_SET_DATA_TYPE_MASK ) { +case VFIO_IRQ_SET_DATA_NONE : + size =0 ; +break ; +case VFIO_IRQ_SET_DATA_BOOL : + size =sizeof (uint8_t ); +break ; +case VFIO_IRQ_SET_DATA_EVENTFD : + size =sizeof (int32_t ); +break ; +default : +return -EINVAL ; + } -if (hdr.argsz - minsz < hdr.count * size || - hdr.start >= max || hdr.start + hdr.count > max) +if (size) { +if (hdr.argsz - minsz < hdr.count * size)return -EINVAL ; data = memdup_user((void __user *)(arg + minsz),
drivers/vfio/pci/vfio_pci_intrs.c +1 -1
@@ -255,7 +255,7 @@ static int vfio_msi_enable(struct vfio_pci_device *vdev, int nvec, bool msix)if (!is_irq_none (vdev))return -EINVAL ; - vdev->ctx =kzalloc (nvec *sizeof (struct vfio_pci_irq_ctx ),GFP_KERNEL ); + vdev->ctx =kcalloc (nvec,sizeof (struct vfio_pci_irq_ctx ),GFP_KERNEL );if (!vdev->ctx)return -ENOMEM ;
fs/gfs2/dir.c +2 -2
@@ -760,7 +760,7 @@ static int get_first_leaf(struct gfs2_inode *dip, u32 index,int error; error =get_leaf_nr (dip, index, &leaf_no); -if (!error) +if (!IS_ERR_VALUE (error)) error =get_leaf (dip, leaf_no, bh_out);return error;
@@ -976,7 +976,7 @@ static int dir_split_leaf(struct inode *inode, const struct qstr *name) index = name->hash >> (32 - dip->i_depth); error =get_leaf_nr (dip, index, &leaf_no); -if (error) +if (IS_ERR_VALUE (error))return error;/* Get the old leaf block */
fs/mount.h +2 -0
@@ -13,6 +13,8 @@ struct mnt_namespace {u64 seq;/* Sequence number to prevent loops */ wait_queue_head_t poll;u64 event; +unsigned int mounts;/* # of mounts in the namespace */ +unsigned int pending_mounts; };struct mnt_pcp {
fs/namespace.c +49 -1
119 lines not on this page · raw message
fs/pnode.c +1 -1
@@ -259,7 +259,7 @@ static int propagate_one(struct mount *m)read_sequnlock_excl (&mount_lock); }hlist_add_head (&child->mnt_hash, list); -return 0 ; +return count_mounts (m->mnt_ns, child); }/*
fs/pnode.h +1 -0
@@ -54,4 +54,5 @@ void mnt_change_mountpoint(struct mount *parent, struct mountpoint *mp,struct mount *copy_tree (struct mount *,struct dentry *,int );bool is_path_reachable (struct mount *,struct dentry *,const struct path *root); +int count_mounts (struct mnt_namespace *ns,struct mount *mnt);#endif /* _LINUX_PNODE_H */
include/linux/mount.h +2 -0
@@ -95,4 +95,6 @@ extern void mark_mounts_for_expiry(struct list_head *mounts);extern dev_t name_to_dev_t (const char *name); +extern unsigned int sysctl_mount_max; +#endif /* _LINUX_MOUNT_H */
kernel/events/core.c +53 -4
81 lines not on this page · raw message
kernel/sysctl.c +9 -0
@@ -65,6 +65,7 @@#include <linux/sched/sysctl.h> #include <linux/kexec.h> #include <linux/bpf.h> +#include <linux/mount.h> #include <asm/uaccess.h> #include <asm/processor.h>
@@ -1749,6 +1750,14 @@ static struct ctl_table fs_table[] = { .mode = 0644, .proc_handler = proc_doulongvec_minmax, }, + { + .procname = "mount-max", + .data = &sysctl_mount_max, + .maxlen = sizeof(unsigned int), + .mode = 0644, + .proc_handler = proc_dointvec_minmax, + .extra1 = &one, + }, { } };
net/ipv4/ping.c +3 -2
@@ -154,17 +154,18 @@ void ping_hash(struct sock *sk)void ping_unhash (struct sock *sk) {struct inet_sock *isk =inet_sk (sk); +pr_debug ("ping_unhash(isk=%p,isk->num=%u)\n" , isk, isk->inet_num); +write_lock_bh (&ping_table.lock);if (sk_hashed (sk)) { -write_lock_bh (&ping_table.lock);hlist_nulls_del (&sk->sk_nulls_node);sk_nulls_node_init (&sk->sk_nulls_node);sock_put (sk); isk->inet_num =0 ; isk->inet_sport =0 ;sock_prot_inuse_add (sock_net (sk), sk->sk_prot,-1 ); -write_unlock_bh (&ping_table.lock); } +write_unlock_bh (&ping_table.lock); }EXPORT_SYMBOL_GPL (ping_unhash);
net/netfilter/nfnetlink.c +6 -4
@@ -326,10 +326,12 @@ replay: nlh =nlmsg_hdr (skb); err =0 ; -if (nlmsg_len (nlh) <sizeof (struct nfgenmsg ) || - skb->len < nlh->nlmsg_len) { - err = -EINVAL ; - goto ack; +if (nlh->nlmsg_len <NLMSG_HDRLEN || + skb->len < nlh->nlmsg_len || +nlmsg_len (nlh) <sizeof (struct nfgenmsg )) { +nfnl_err_reset (&err_list); + status |=NFNL_BATCH_FAILURE ; + goto done; }/* Only requests are handled by the kernel */
net/tipc/bearer.c +11 -2
@@ -381,6 +381,10 @@ int tipc_enable_l2_media(struct net *net, struct tipc_bearer *b, dev =dev_get_by_name (net, driver_name);if (!dev)return -ENODEV ; +if (tipc_mtu_bad (dev,0 )) { +dev_put (dev); +return -EINVAL ; + }/* Associate TIPC bearer with L2 bearer */ rcu_assign_pointer (b->media_ptr, dev);
@@ -570,14 +574,19 @@ static int tipc_l2_device_event(struct notifier_block *nb, unsigned long evt,if (!b_ptr)return NOTIFY_DONE ; - b_ptr->mtu = dev->mtu; -switch (evt) {case NETDEV_CHANGE :if (netif_carrier_ok (dev))break ;case NETDEV_GOING_DOWN : +tipc_reset_bearer (net, b_ptr); +break ;case NETDEV_CHANGEMTU : +if (tipc_mtu_bad (dev,0 )) { +bearer_disable (net, b_ptr); +break ; + } + b_ptr->mtu = dev->mtu;tipc_reset_bearer (net, b_ptr);break ;case NETDEV_CHANGEADDR :
net/tipc/bearer.h +13 -0
@@ -39,6 +39,7 @@#include "netlink.h" #include "core.h" +#include "msg.h" #include <net/genetlink.h> #define MAX_MEDIA 3
@@ -61,6 +62,9 @@#define TIPC_MEDIA_TYPE_IB 2#define TIPC_MEDIA_TYPE_UDP 3 +/* minimum bearer MTU */ +#define TIPC_MIN_BEARER_MTU (MAX_H_SIZE + INT_H_SIZE) +/** * struct tipc_node_map - set of node identifiers * @count: # of nodes in set
@@ -226,4 +230,13 @@ void tipc_bearer_xmit(struct net *net, u32 bearer_id,void tipc_bearer_bc_xmit (struct net *net,u32 bearer_id,struct sk_buff_head *xmitq); +/* check if device MTU is too low for tipc headers */ +static inline bool tipc_mtu_bad (struct net_device *dev,unsigned int reserve) +{ +if (dev->mtu >=TIPC_MIN_BEARER_MTU + reserve) +return false; +netdev_warn (dev,"MTU too low for tipc bearer\n" ); +return true; +} +#endif /* _TIPC_BEARER_H */
net/tipc/core.c +1 -0
@@ -69,6 +69,7 @@ static int __net_init tipc_init_net(struct net *net)if (err) goto out_nametbl; +INIT_LIST_HEAD (&tn->dist_queue); err =tipc_topsrv_start (net);if (err) goto out_subscr;
net/tipc/core.h +3 -0
@@ -103,6 +103,9 @@ struct tipc_net {spinlock_t nametbl_lock;struct name_table *nametbl; +/* Name dist queue */ +struct list_head dist_queue; +/* Topology subscription server */ struct tipc_server *topsrv;atomic_t subscription_count;
net/tipc/name_distr.c +12 -12
@@ -40,11 +40,6 @@int sysctl_tipc_named_timeout__read_mostly =2000 ; -/** -* struct tipc_dist_queue - queue holding deferred name table updates -*/ -static struct list_head tipc_dist_queue =LIST_HEAD_INIT (tipc_dist_queue); -struct distr_queue_item {struct distr_item i;u32 dtype;
@@ -67,6 +62,8 @@ static void publ_to_item(struct distr_item *i, struct publication *p)/** * named_prepare_buf - allocate & initialize a publication message +* +* The buffer returned is of size INT_H_SIZE + payload size */ static struct sk_buff *named_prepare_buf (struct net *net,u32 type,u32 size,u32 dest)
@@ -171,9 +168,9 @@ static void named_distribute(struct net *net, struct sk_buff_head *list,struct publication *publ;struct sk_buff *skb =NULL ;struct distr_item *item =NULL ; -uint msg_dsz = (tipc_node_get_mtu (net, dnode,0 ) /ITEM_SIZE ) * -ITEM_SIZE ; -uint msg_rem = msg_dsz; +u32 msg_dsz = ((tipc_node_get_mtu (net, dnode,0 ) -INT_H_SIZE ) / +ITEM_SIZE ) *ITEM_SIZE ; +u32 msg_rem = msg_dsz;list_for_each_entry (publ, pls, local_list) {/* Prepare next buffer: */
@@ -340,9 +337,11 @@ static bool tipc_update_nametbl(struct net *net, struct distr_item *i,* tipc_named_add_backlog - add a failed name table update to the backlog * */ -static void tipc_named_add_backlog (struct distr_item *i,u32 type,u32 node) +static void tipc_named_add_backlog (struct net *net,struct distr_item *i, +u32 type,u32 node) {struct distr_queue_item *e; +struct tipc_net *tn =net_generic (net, tipc_net_id);unsigned long now =get_jiffies_64 (); e =kzalloc (sizeof (*e),GFP_ATOMIC );
@@ -352,7 +351,7 @@ static void tipc_named_add_backlog(struct distr_item *i, u32 type, u32 node) e->node = node; e->expires = now +msecs_to_jiffies (sysctl_tipc_named_timeout);memcpy (e, i,sizeof (*i)); -list_add_tail (&e->next, &tipc_dist_queue); +list_add_tail (&e->next, &tn->dist_queue); }/**
@@ -362,10 +361,11 @@ static void tipc_named_add_backlog(struct distr_item *i, u32 type, u32 node)void tipc_named_process_backlog (struct net *net) {struct distr_queue_item *e, *tmp; +struct tipc_net *tn =net_generic (net, tipc_net_id);char addr[16 ];unsigned long now =get_jiffies_64 (); -list_for_each_entry_safe (e, tmp, &tipc_dist_queue, next) { +list_for_each_entry_safe (e, tmp, &tn->dist_queue, next) {if (time_after (e->expires, now)) {if (!tipc_update_nametbl (net, &e->i, e->node, e->dtype))continue ;
@@ -405,7 +405,7 @@ void tipc_named_rcv(struct net *net, struct sk_buff_head *inputq) node =msg_orignode (msg);while (count--) {if (!tipc_update_nametbl (net, item, node, mtype)) -tipc_named_add_backlog (item, mtype, node); +tipc_named_add_backlog (net, item, mtype, node); item++; }kfree_skb (skb);
net/tipc/node.c +2 -2
@@ -728,7 +728,7 @@ static void tipc_node_fsm_evt(struct tipc_node *n, int evt) state =SELF_UP_PEER_UP ;break ;case SELF_LOST_CONTACT_EVT : - state =SELF_DOWN_PEER_LEAVING ; + state =SELF_DOWN_PEER_DOWN ;break ;case SELF_ESTABL_CONTACT_EVT :case PEER_LOST_CONTACT_EVT :
@@ -747,7 +747,7 @@ static void tipc_node_fsm_evt(struct tipc_node *n, int evt) state =SELF_UP_PEER_UP ;break ;case PEER_LOST_CONTACT_EVT : - state =SELF_LEAVING_PEER_DOWN ; + state =SELF_DOWN_PEER_DOWN ;break ;case SELF_LOST_CONTACT_EVT :case PEER_ESTABL_CONTACT_EVT :
net/tipc/socket.c +43 -13
142 lines not on this page · raw message
net/tipc/udp_media.c +6 -1
@@ -52,7 +52,7 @@/* IANA assigned UDP port */ #define UDP_PORT_DEFAULT 6118 -#define UDP_MIN_HEADROOM 28 +#define UDP_MIN_HEADROOM 48static const struct nla_policy tipc_nl_udp_policy[TIPC_NLA_UDP_MAX +1 ] = { [TIPC_NLA_UDP_UNSPEC ] = {.type =NLA_UNSPEC },
@@ -376,6 +376,11 @@ static int tipc_udp_enable(struct net *net, struct tipc_bearer *b, udp_conf.local_ip.s_addr =htonl (INADDR_ANY ); udp_conf.use_udp_checksums = false; ub->ifindex = dev->ifindex; +if (tipc_mtu_bad (dev,sizeof (struct iphdr ) + +sizeof (struct udphdr ))) { + err = -EINVAL ; + goto err; + } b->mtu = dev->mtu -sizeof (struct iphdr ) -sizeof (struct udphdr );#if IS_ENABLED (CONFIG_IPV6 )