diff -druNp --no-dereference linux-libre-3.18.112-gnu/arch/mips/kernel/ptrace32.c linux-libre-3.18.113-gnu/arch/mips/kernel/ptrace32.c
--- linux-libre-3.18.112-gnu/arch/mips/kernel/ptrace32.c	2018-05-30 16:08:04.000000000 -0400
+++ linux-libre-3.18.113-gnu/arch/mips/kernel/ptrace32.c	2018-06-13 10:12:22.000000000 -0400
@@ -107,7 +107,7 @@ long compat_arch_ptrace(struct task_stru
 						addr & 1);
 				break;
 			}
-			tmp = get_fpr32(&fregs[addr - FPR_BASE], 0);
+			tmp = get_fpr64(&fregs[addr - FPR_BASE], 0);
 			break;
 		case PC:
 			tmp = regs->cp0_epc;
diff -druNp --no-dereference linux-libre-3.18.112-gnu/arch/mips/kernel/ptrace.c linux-libre-3.18.113-gnu/arch/mips/kernel/ptrace.c
--- linux-libre-3.18.112-gnu/arch/mips/kernel/ptrace.c	2018-05-30 16:08:04.000000000 -0400
+++ linux-libre-3.18.113-gnu/arch/mips/kernel/ptrace.c	2018-06-13 10:12:22.000000000 -0400
@@ -713,7 +713,7 @@ long arch_ptrace(struct task_struct *chi
 				break;
 			}
 #endif
-			tmp = get_fpr32(&fregs[addr - FPR_BASE], 0);
+			tmp = get_fpr64(&fregs[addr - FPR_BASE], 0);
 			break;
 		case PC:
 			tmp = regs->cp0_epc;
diff -druNp --no-dereference linux-libre-3.18.112-gnu/drivers/gpu/drm/drm_fops.c linux-libre-3.18.113-gnu/drivers/gpu/drm/drm_fops.c
--- linux-libre-3.18.112-gnu/drivers/gpu/drm/drm_fops.c	2018-05-30 16:08:04.000000000 -0400
+++ linux-libre-3.18.113-gnu/drivers/gpu/drm/drm_fops.c	2018-06-13 10:12:22.000000000 -0400
@@ -155,6 +155,7 @@ static int drm_open_helper(struct file *
 		return -ENOMEM;
 
 	filp->private_data = priv;
+	filp->f_mode |= FMODE_UNSIGNED_OFFSET;
 	priv->filp = filp;
 	priv->uid = current_euid();
 	priv->pid = get_pid(task_pid(current));
diff -druNp --no-dereference linux-libre-3.18.112-gnu/drivers/gpu/drm/i915/intel_lvds.c linux-libre-3.18.113-gnu/drivers/gpu/drm/i915/intel_lvds.c
--- linux-libre-3.18.112-gnu/drivers/gpu/drm/i915/intel_lvds.c	2018-05-30 16:08:04.000000000 -0400
+++ linux-libre-3.18.113-gnu/drivers/gpu/drm/i915/intel_lvds.c	2018-06-13 10:12:22.000000000 -0400
@@ -745,6 +745,14 @@ static const struct dmi_system_id intel_
 			DMI_EXACT_MATCH(DMI_BOARD_NAME, "D525MW"),
 		},
 	},
+	{
+		.callback = intel_no_lvds_dmi_callback,
+		.ident = "Radiant P845",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Radiant Systems Inc"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "P845"),
+		},
+	},
 
 	{ }	/* terminating entry */
 };
diff -druNp --no-dereference linux-libre-3.18.112-gnu/drivers/isdn/hardware/eicon/diva.c linux-libre-3.18.113-gnu/drivers/isdn/hardware/eicon/diva.c
--- linux-libre-3.18.112-gnu/drivers/isdn/hardware/eicon/diva.c	2018-05-30 16:08:04.000000000 -0400
+++ linux-libre-3.18.113-gnu/drivers/isdn/hardware/eicon/diva.c	2018-06-13 10:12:22.000000000 -0400
@@ -387,10 +387,10 @@ void divasa_xdi_driver_unload(void)
 **  Receive and process command from user mode utility
 */
 void *diva_xdi_open_adapter(void *os_handle, const void __user *src,
-			    int length,
+			    int length, void *mptr,
 			    divas_xdi_copy_from_user_fn_t cp_fn)
 {
-	diva_xdi_um_cfg_cmd_t msg;
+	diva_xdi_um_cfg_cmd_t *msg = (diva_xdi_um_cfg_cmd_t *)mptr;
 	diva_os_xdi_adapter_t *a = NULL;
 	diva_os_spin_lock_magic_t old_irql;
 	struct list_head *tmp;
@@ -400,21 +400,21 @@ void *diva_xdi_open_adapter(void *os_han
 			 length, sizeof(diva_xdi_um_cfg_cmd_t)))
 			return NULL;
 	}
-	if ((*cp_fn) (os_handle, &msg, src, sizeof(msg)) <= 0) {
+	if ((*cp_fn) (os_handle, msg, src, sizeof(*msg)) <= 0) {
 		DBG_ERR(("A: A(?) open, write error"))
 			return NULL;
 	}
 	diva_os_enter_spin_lock(&adapter_lock, &old_irql, "open_adapter");
 	list_for_each(tmp, &adapter_queue) {
 		a = list_entry(tmp, diva_os_xdi_adapter_t, link);
-		if (a->controller == (int)msg.adapter)
+		if (a->controller == (int)msg->adapter)
 			break;
 		a = NULL;
 	}
 	diva_os_leave_spin_lock(&adapter_lock, &old_irql, "open_adapter");
 
 	if (!a) {
-		DBG_ERR(("A: A(%d) open, adapter not found", msg.adapter))
+		DBG_ERR(("A: A(%d) open, adapter not found", msg->adapter))
 			}
 
 	return (a);
@@ -436,8 +436,10 @@ void diva_xdi_close_adapter(void *adapte
 
 int
 diva_xdi_write(void *adapter, void *os_handle, const void __user *src,
-	       int length, divas_xdi_copy_from_user_fn_t cp_fn)
+	       int length, void *mptr,
+	       divas_xdi_copy_from_user_fn_t cp_fn)
 {
+	diva_xdi_um_cfg_cmd_t *msg = (diva_xdi_um_cfg_cmd_t *)mptr;
 	diva_os_xdi_adapter_t *a = (diva_os_xdi_adapter_t *) adapter;
 	void *data;
 
@@ -458,7 +460,13 @@ diva_xdi_write(void *adapter, void *os_h
 			return (-2);
 	}
 
-	length = (*cp_fn) (os_handle, data, src, length);
+	if (msg) {
+		*(diva_xdi_um_cfg_cmd_t *)data = *msg;
+		length = (*cp_fn) (os_handle, (char *)data + sizeof(*msg),
+				   src + sizeof(*msg), length - sizeof(*msg));
+	} else {
+		length = (*cp_fn) (os_handle, data, src, length);
+	}
 	if (length > 0) {
 		if ((*(a->interface.cmd_proc))
 		    (a, (diva_xdi_um_cfg_cmd_t *) data, length)) {
diff -druNp --no-dereference linux-libre-3.18.112-gnu/drivers/isdn/hardware/eicon/diva.h linux-libre-3.18.113-gnu/drivers/isdn/hardware/eicon/diva.h
--- linux-libre-3.18.112-gnu/drivers/isdn/hardware/eicon/diva.h	2018-05-30 16:08:04.000000000 -0400
+++ linux-libre-3.18.113-gnu/drivers/isdn/hardware/eicon/diva.h	2018-06-13 10:12:22.000000000 -0400
@@ -19,10 +19,11 @@ int diva_xdi_read(void *adapter, void *o
 		  int max_length, divas_xdi_copy_to_user_fn_t cp_fn);
 
 int diva_xdi_write(void *adapter, void *os_handle, const void __user *src,
-		   int length, divas_xdi_copy_from_user_fn_t cp_fn);
+		   int length, void *msg,
+		   divas_xdi_copy_from_user_fn_t cp_fn);
 
 void *diva_xdi_open_adapter(void *os_handle, const void __user *src,
-			    int length,
+			    int length, void *msg,
 			    divas_xdi_copy_from_user_fn_t cp_fn);
 
 void diva_xdi_close_adapter(void *adapter, void *os_handle);
diff -druNp --no-dereference linux-libre-3.18.112-gnu/drivers/isdn/hardware/eicon/divasmain.c linux-libre-3.18.113-gnu/drivers/isdn/hardware/eicon/divasmain.c
--- linux-libre-3.18.112-gnu/drivers/isdn/hardware/eicon/divasmain.c	2018-05-30 16:08:04.000000000 -0400
+++ linux-libre-3.18.113-gnu/drivers/isdn/hardware/eicon/divasmain.c	2018-06-13 10:12:22.000000000 -0400
@@ -591,19 +591,22 @@ static int divas_release(struct inode *i
 static ssize_t divas_write(struct file *file, const char __user *buf,
 			   size_t count, loff_t *ppos)
 {
+	diva_xdi_um_cfg_cmd_t msg;
 	int ret = -EINVAL;
 
 	if (!file->private_data) {
 		file->private_data = diva_xdi_open_adapter(file, buf,
-							   count,
+							   count, &msg,
 							   xdi_copy_from_user);
-	}
-	if (!file->private_data) {
-		return (-ENODEV);
+		if (!file->private_data)
+			return (-ENODEV);
+		ret = diva_xdi_write(file->private_data, file,
+				     buf, count, &msg, xdi_copy_from_user);
+	} else {
+		ret = diva_xdi_write(file->private_data, file,
+				     buf, count, NULL, xdi_copy_from_user);
 	}
 
-	ret = diva_xdi_write(file->private_data, file,
-			     buf, count, xdi_copy_from_user);
 	switch (ret) {
 	case -1:		/* Message should be removed from rx mailbox first */
 		ret = -EBUSY;
@@ -622,11 +625,12 @@ static ssize_t divas_write(struct file *
 static ssize_t divas_read(struct file *file, char __user *buf,
 			  size_t count, loff_t *ppos)
 {
+	diva_xdi_um_cfg_cmd_t msg;
 	int ret = -EINVAL;
 
 	if (!file->private_data) {
 		file->private_data = diva_xdi_open_adapter(file, buf,
-							   count,
+							   count, &msg,
 							   xdi_copy_from_user);
 	}
 	if (!file->private_data) {
diff -druNp --no-dereference linux-libre-3.18.112-gnu/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c linux-libre-3.18.113-gnu/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
--- linux-libre-3.18.112-gnu/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c	2018-05-30 16:08:04.000000000 -0400
+++ linux-libre-3.18.113-gnu/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c	2018-06-13 10:12:22.000000000 -0400
@@ -588,7 +588,7 @@ static void bnx2x_ets_e3b0_nig_disabled(
 	 * slots for the highest priority.
 	 */
 	REG_WR(bp, (port) ? NIG_REG_P1_TX_ARB_NUM_STRICT_ARB_SLOTS :
-		   NIG_REG_P1_TX_ARB_NUM_STRICT_ARB_SLOTS, 0x100);
+		   NIG_REG_P0_TX_ARB_NUM_STRICT_ARB_SLOTS, 0x100);
 	/* Mapping between the CREDIT_WEIGHT registers and actual client
 	 * numbers
 	 */
diff -druNp --no-dereference linux-libre-3.18.112-gnu/drivers/net/ethernet/cisco/enic/enic_main.c linux-libre-3.18.113-gnu/drivers/net/ethernet/cisco/enic/enic_main.c
--- linux-libre-3.18.112-gnu/drivers/net/ethernet/cisco/enic/enic_main.c	2018-05-30 16:08:04.000000000 -0400
+++ linux-libre-3.18.113-gnu/drivers/net/ethernet/cisco/enic/enic_main.c	2018-06-13 10:12:22.000000000 -0400
@@ -2362,11 +2362,11 @@ static int enic_probe(struct pci_dev *pd
 	pci_set_master(pdev);
 
 	/* Query PCI controller on system for DMA addressing
-	 * limitation for the device.  Try 64-bit first, and
+	 * limitation for the device.  Try 47-bit first, and
 	 * fail to 32-bit.
 	 */
 
-	err = pci_set_dma_mask(pdev, DMA_BIT_MASK(64));
+	err = pci_set_dma_mask(pdev, DMA_BIT_MASK(47));
 	if (err) {
 		err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
 		if (err) {
@@ -2380,10 +2380,10 @@ static int enic_probe(struct pci_dev *pd
 			goto err_out_release_regions;
 		}
 	} else {
-		err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));
+		err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(47));
 		if (err) {
 			dev_err(dev, "Unable to obtain %u-bit DMA "
-				"for consistent allocations, aborting\n", 64);
+				"for consistent allocations, aborting\n", 47);
 			goto err_out_release_regions;
 		}
 		using_dac = 1;
diff -druNp --no-dereference linux-libre-3.18.112-gnu/drivers/net/ethernet/mellanox/mlx4/qp.c linux-libre-3.18.113-gnu/drivers/net/ethernet/mellanox/mlx4/qp.c
--- linux-libre-3.18.112-gnu/drivers/net/ethernet/mellanox/mlx4/qp.c	2018-05-30 16:08:04.000000000 -0400
+++ linux-libre-3.18.113-gnu/drivers/net/ethernet/mellanox/mlx4/qp.c	2018-06-13 10:12:22.000000000 -0400
@@ -363,11 +363,11 @@ struct mlx4_qp *mlx4_qp_lookup(struct ml
 	struct mlx4_qp_table *qp_table = &mlx4_priv(dev)->qp_table;
 	struct mlx4_qp *qp;
 
-	spin_lock(&qp_table->lock);
+	spin_lock_irq(&qp_table->lock);
 
 	qp = __mlx4_qp_lookup(dev, qpn);
 
-	spin_unlock(&qp_table->lock);
+	spin_unlock_irq(&qp_table->lock);
 	return qp;
 }
 
diff -druNp --no-dereference linux-libre-3.18.112-gnu/drivers/net/team/team.c linux-libre-3.18.113-gnu/drivers/net/team/team.c
--- linux-libre-3.18.112-gnu/drivers/net/team/team.c	2018-05-30 16:08:04.000000000 -0400
+++ linux-libre-3.18.113-gnu/drivers/net/team/team.c	2018-06-13 10:12:22.000000000 -0400
@@ -989,7 +989,8 @@ static void team_port_disable(struct tea
 static void __team_compute_features(struct team *team)
 {
 	struct team_port *port;
-	u32 vlan_features = TEAM_VLAN_FEATURES & NETIF_F_ALL_FOR_ALL;
+	netdev_features_t vlan_features = TEAM_VLAN_FEATURES &
+					  NETIF_F_ALL_FOR_ALL;
 	unsigned short max_hard_header_len = ETH_HLEN;
 	unsigned int dst_release_flag = IFF_XMIT_DST_RELEASE |
 					IFF_XMIT_DST_RELEASE_PERM;
diff -druNp --no-dereference linux-libre-3.18.112-gnu/drivers/net/usb/cdc_mbim.c linux-libre-3.18.113-gnu/drivers/net/usb/cdc_mbim.c
--- linux-libre-3.18.112-gnu/drivers/net/usb/cdc_mbim.c	2018-05-30 16:08:04.000000000 -0400
+++ linux-libre-3.18.113-gnu/drivers/net/usb/cdc_mbim.c	2018-06-13 10:12:22.000000000 -0400
@@ -550,7 +550,7 @@ err:
 
 static const struct driver_info cdc_mbim_info = {
 	.description = "CDC MBIM",
-	.flags = FLAG_NO_SETINT | FLAG_MULTI_PACKET | FLAG_WWAN,
+	.flags = FLAG_NO_SETINT | FLAG_MULTI_PACKET | FLAG_WWAN | FLAG_SEND_ZLP,
 	.bind = cdc_mbim_bind,
 	.unbind = cdc_mbim_unbind,
 	.manage_power = cdc_mbim_manage_power,
diff -druNp --no-dereference linux-libre-3.18.112-gnu/fs/aio.c linux-libre-3.18.113-gnu/fs/aio.c
--- linux-libre-3.18.112-gnu/fs/aio.c	2018-05-30 16:08:04.000000000 -0400
+++ linux-libre-3.18.113-gnu/fs/aio.c	2018-06-13 10:12:22.000000000 -0400
@@ -560,9 +560,8 @@ static void free_ioctx_users(struct perc
 	while (!list_empty(&ctx->active_reqs)) {
 		req = list_first_entry(&ctx->active_reqs,
 				       struct kiocb, ki_list);
-
-		list_del_init(&req->ki_list);
 		kiocb_cancel(req);
+		list_del_init(&req->ki_list);
 	}
 
 	spin_unlock_irq(&ctx->ctx_lock);
diff -druNp --no-dereference linux-libre-3.18.112-gnu/include/linux/tcp.h linux-libre-3.18.113-gnu/include/linux/tcp.h
--- linux-libre-3.18.112-gnu/include/linux/tcp.h	2018-05-30 16:08:04.000000000 -0400
+++ linux-libre-3.18.113-gnu/include/linux/tcp.h	2018-06-13 10:12:22.000000000 -0400
@@ -292,7 +292,7 @@ struct tcp_sock {
 
 /* Receiver queue space */
 	struct {
-		int	space;
+		u32	space;
 		u32	seq;
 		u32	time;
 	} rcvq_space;
diff -druNp --no-dereference linux-libre-3.18.112-gnu/include/uapi/linux/nl80211.h linux-libre-3.18.113-gnu/include/uapi/linux/nl80211.h
--- linux-libre-3.18.112-gnu/include/uapi/linux/nl80211.h	2018-05-30 16:08:04.000000000 -0400
+++ linux-libre-3.18.113-gnu/include/uapi/linux/nl80211.h	2018-06-13 10:12:22.000000000 -0400
@@ -2026,7 +2026,7 @@ enum nl80211_attrs {
 #define NL80211_ATTR_KEYS NL80211_ATTR_KEYS
 #define NL80211_ATTR_FEATURE_FLAGS NL80211_ATTR_FEATURE_FLAGS
 
-#define NL80211_WIPHY_NAME_MAXLEN		128
+#define NL80211_WIPHY_NAME_MAXLEN		64
 
 #define NL80211_MAX_SUPP_RATES			32
 #define NL80211_MAX_SUPP_HT_RATES		77
diff -druNp --no-dereference linux-libre-3.18.112-gnu/kernel/trace/trace_events_trigger.c linux-libre-3.18.113-gnu/kernel/trace/trace_events_trigger.c
--- linux-libre-3.18.112-gnu/kernel/trace/trace_events_trigger.c	2018-05-30 16:08:04.000000000 -0400
+++ linux-libre-3.18.113-gnu/kernel/trace/trace_events_trigger.c	2018-06-13 10:12:22.000000000 -0400
@@ -469,9 +469,10 @@ clear_event_triggers(struct trace_array
 	struct ftrace_event_file *file;
 
 	list_for_each_entry(file, &tr->events, list) {
-		struct event_trigger_data *data;
-		list_for_each_entry_rcu(data, &file->triggers, list) {
+		struct event_trigger_data *data, *n;
+		list_for_each_entry_safe(data, n, &file->triggers, list) {
 			trace_event_trigger_enable_disable(file, 0);
+			list_del_rcu(&data->list);
 			if (data->ops->free)
 				data->ops->free(data->ops, data);
 		}
diff -druNp --no-dereference linux-libre-3.18.112-gnu/Makefile linux-libre-3.18.113-gnu/Makefile
--- linux-libre-3.18.112-gnu/Makefile	2018-05-30 23:30:52.000000000 -0400
+++ linux-libre-3.18.113-gnu/Makefile	2018-06-13 14:55:16.000000000 -0400
@@ -1,6 +1,6 @@
 VERSION = 3
 PATCHLEVEL = 18
-SUBLEVEL = 112
+SUBLEVEL = 113
 EXTRAVERSION =-gnu
 NAME = Diseased Newt
 
diff -druNp --no-dereference linux-libre-3.18.112-gnu/mm/mmap.c linux-libre-3.18.113-gnu/mm/mmap.c
--- linux-libre-3.18.112-gnu/mm/mmap.c	2018-05-30 16:08:04.000000000 -0400
+++ linux-libre-3.18.113-gnu/mm/mmap.c	2018-06-13 10:12:22.000000000 -0400
@@ -1271,6 +1271,35 @@ static inline int mlock_future_check(str
 	return 0;
 }
 
+static inline u64 file_mmap_size_max(struct file *file, struct inode *inode)
+{
+	if (S_ISREG(inode->i_mode))
+		return MAX_LFS_FILESIZE;
+
+	if (S_ISBLK(inode->i_mode))
+		return MAX_LFS_FILESIZE;
+
+	/* Special "we do even unsigned file positions" case */
+	if (file->f_mode & FMODE_UNSIGNED_OFFSET)
+		return 0;
+
+	/* Yes, random drivers might want more. But I'm tired of buggy drivers */
+	return ULONG_MAX;
+}
+
+static inline bool file_mmap_ok(struct file *file, struct inode *inode,
+				unsigned long pgoff, unsigned long len)
+{
+	u64 maxsize = file_mmap_size_max(file, inode);
+
+	if (maxsize && len > maxsize)
+		return false;
+	maxsize -= len;
+	if (pgoff > maxsize >> PAGE_SHIFT)
+		return false;
+	return true;
+}
+
 /*
  * The caller must hold down_write(&current->mm->mmap_sem).
  */
@@ -1338,6 +1367,9 @@ unsigned long do_mmap_pgoff(struct file
 	if (file) {
 		struct inode *inode = file_inode(file);
 
+		if (!file_mmap_ok(file, inode, pgoff, len))
+			return -EOVERFLOW;
+
 		switch (flags & MAP_TYPE) {
 		case MAP_SHARED:
 			if ((prot&PROT_WRITE) && !(file->f_mode&FMODE_WRITE))
diff -druNp --no-dereference linux-libre-3.18.112-gnu/mm/vmscan.c linux-libre-3.18.113-gnu/mm/vmscan.c
--- linux-libre-3.18.112-gnu/mm/vmscan.c	2018-05-30 16:08:04.000000000 -0400
+++ linux-libre-3.18.113-gnu/mm/vmscan.c	2018-06-13 10:12:22.000000000 -0400
@@ -1234,7 +1234,7 @@ int __isolate_lru_page(struct page *page
 				return ret;
 
 			mapping = page_mapping(page);
-			migrate_dirty = mapping && mapping->a_ops->migratepage;
+			migrate_dirty = !mapping || mapping->a_ops->migratepage;
 			unlock_page(page);
 			if (!migrate_dirty)
 				return ret;
diff -druNp --no-dereference linux-libre-3.18.112-gnu/net/core/rtnetlink.c linux-libre-3.18.113-gnu/net/core/rtnetlink.c
--- linux-libre-3.18.112-gnu/net/core/rtnetlink.c	2018-05-30 16:08:04.000000000 -0400
+++ linux-libre-3.18.113-gnu/net/core/rtnetlink.c	2018-06-13 10:12:22.000000000 -0400
@@ -1503,6 +1503,10 @@ static int do_setlink(const struct sk_bu
 	const struct net_device_ops *ops = dev->netdev_ops;
 	int err;
 
+	err = validate_linkmsg(dev, tb);
+	if (err < 0)
+		return err;
+
 	if (tb[IFLA_NET_NS_PID] || tb[IFLA_NET_NS_FD]) {
 		struct net *net = rtnl_link_get_net(dev_net(dev), tb);
 		if (IS_ERR(net)) {
@@ -1783,10 +1787,6 @@ static int rtnl_setlink(struct sk_buff *
 		goto errout;
 	}
 
-	err = validate_linkmsg(dev, tb);
-	if (err < 0)
-		goto errout;
-
 	err = do_setlink(skb, dev, ifm, tb, ifname, 0);
 errout:
 	return err;
diff -druNp --no-dereference linux-libre-3.18.112-gnu/net/dccp/proto.c linux-libre-3.18.113-gnu/net/dccp/proto.c
--- linux-libre-3.18.112-gnu/net/dccp/proto.c	2018-05-30 16:08:04.000000000 -0400
+++ linux-libre-3.18.113-gnu/net/dccp/proto.c	2018-06-13 10:12:22.000000000 -0400
@@ -280,9 +280,7 @@ int dccp_disconnect(struct sock *sk, int
 
 	dccp_clear_xmit_timers(sk);
 	ccid_hc_rx_delete(dp->dccps_hc_rx_ccid, sk);
-	ccid_hc_tx_delete(dp->dccps_hc_tx_ccid, sk);
 	dp->dccps_hc_rx_ccid = NULL;
-	dp->dccps_hc_tx_ccid = NULL;
 
 	__skb_queue_purge(&sk->sk_receive_queue);
 	__skb_queue_purge(&sk->sk_write_queue);
diff -druNp --no-dereference linux-libre-3.18.112-gnu/net/ipv4/tcp_input.c linux-libre-3.18.113-gnu/net/ipv4/tcp_input.c
--- linux-libre-3.18.112-gnu/net/ipv4/tcp_input.c	2018-05-30 16:08:04.000000000 -0400
+++ linux-libre-3.18.113-gnu/net/ipv4/tcp_input.c	2018-06-13 10:12:22.000000000 -0400
@@ -550,8 +550,8 @@ static inline void tcp_rcv_rtt_measure_t
 void tcp_rcv_space_adjust(struct sock *sk)
 {
 	struct tcp_sock *tp = tcp_sk(sk);
+	u32 copied;
 	int time;
-	int copied;
 
 	time = tcp_time_stamp - tp->rcvq_space.time;
 	if (time < (tp->rcv_rtt_est.rtt >> 3) || tp->rcv_rtt_est.rtt == 0)
@@ -573,12 +573,13 @@ void tcp_rcv_space_adjust(struct sock *s
 
 	if (sysctl_tcp_moderate_rcvbuf &&
 	    !(sk->sk_userlocks & SOCK_RCVBUF_LOCK)) {
-		int rcvwin, rcvmem, rcvbuf;
+		int rcvmem, rcvbuf;
+		u64 rcvwin;
 
 		/* minimal window to cope with packet losses, assuming
 		 * steady state. Add some cushion because of small variations.
 		 */
-		rcvwin = (copied << 1) + 16 * tp->advmss;
+		rcvwin = ((u64)copied << 1) + 16 * tp->advmss;
 
 		/* If rate increased by 25%,
 		 *	assume slow start, rcvwin = 3 * copied
@@ -598,7 +599,8 @@ void tcp_rcv_space_adjust(struct sock *s
 		while (tcp_win_from_space(rcvmem) < tp->advmss)
 			rcvmem += 128;
 
-		rcvbuf = min(rcvwin / tp->advmss * rcvmem, sysctl_tcp_rmem[2]);
+		do_div(rcvwin, tp->advmss);
+		rcvbuf = min_t(u64, rcvwin * rcvmem, sysctl_tcp_rmem[2]);
 		if (rcvbuf > sk->sk_rcvbuf) {
 			sk->sk_rcvbuf = rcvbuf;
 
diff -druNp --no-dereference linux-libre-3.18.112-gnu/net/ipv6/ip6mr.c linux-libre-3.18.113-gnu/net/ipv6/ip6mr.c
--- linux-libre-3.18.112-gnu/net/ipv6/ip6mr.c	2018-05-30 16:08:04.000000000 -0400
+++ linux-libre-3.18.113-gnu/net/ipv6/ip6mr.c	2018-06-13 10:12:22.000000000 -0400
@@ -1788,7 +1788,8 @@ int ip6_mroute_setsockopt(struct sock *s
 		ret = 0;
 		if (!ip6mr_new_table(net, v))
 			ret = -ENOMEM;
-		raw6_sk(sk)->ip6mr_table = v;
+		else
+			raw6_sk(sk)->ip6mr_table = v;
 		rtnl_unlock();
 		return ret;
 	}
diff -druNp --no-dereference linux-libre-3.18.112-gnu/net/packet/af_packet.c linux-libre-3.18.113-gnu/net/packet/af_packet.c
--- linux-libre-3.18.112-gnu/net/packet/af_packet.c	2018-05-30 16:08:04.000000000 -0400
+++ linux-libre-3.18.113-gnu/net/packet/af_packet.c	2018-06-13 10:12:22.000000000 -0400
@@ -3877,7 +3877,7 @@ static int packet_set_ring(struct sock *
 			goto out;
 		if (po->tp_version >= TPACKET_V3 &&
 		    req->tp_block_size <=
-			  BLK_PLUS_PRIV((u64)req_u->req3.tp_sizeof_priv))
+		    BLK_PLUS_PRIV((u64)req_u->req3.tp_sizeof_priv) + sizeof(struct tpacket3_hdr))
 			goto out;
 		if (unlikely(req->tp_frame_size < po->tp_hdrlen +
 					po->tp_reserve))
diff -druNp --no-dereference linux-libre-3.18.112-gnu/security/selinux/ss/services.c linux-libre-3.18.113-gnu/security/selinux/ss/services.c
--- linux-libre-3.18.112-gnu/security/selinux/ss/services.c	2018-05-30 16:08:04.000000000 -0400
+++ linux-libre-3.18.113-gnu/security/selinux/ss/services.c	2018-06-13 10:12:22.000000000 -0400
@@ -1271,7 +1271,7 @@ static int security_context_to_sid_core(
 				      scontext_len, &context, def_sid);
 	if (rc == -EINVAL && force) {
 		context.str = str;
-		context.len = scontext_len;
+		context.len = strlen(str) + 1;
 		str = NULL;
 	} else if (rc)
 		goto out_unlock;
