X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=kernel-small_fixes.patch;h=a227229931d63172b9dc579d98a0799465ecca09;hb=406df5dfc5bc79efd62e0347cb4961cbb7d1bced;hp=9b809da2c299549c8830af6df1b202593eafc761;hpb=aca2852915e8cb81080bdf64933e4baadbc2a74f;p=packages%2Fkernel.git

diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index 9b809da2..a2272299 100644
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -26,54 +26,18 @@
  				exit
  			fi
  		done
-
-diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
-index 7a0c800..ec5ebbb 100644
---- a/drivers/net/ethernet/realtek/r8169.c
-+++ b/drivers/net/ethernet/realtek/r8169.c
-@@ -4103,6 +4103,14 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
- 	/* Get MAC address */
- 	for (i = 0; i < ETH_ALEN; i++)
- 		dev->dev_addr[i] = RTL_R8(MAC0 + i);
-+
-+	if (!is_valid_ether_addr(dev->dev_addr)) {
-+		/* Report it and use a random ethernet address instead */
-+		netdev_err(dev, "Invalid MAC address: %pM\n", dev->dev_addr);
-+		random_ether_addr(dev->dev_addr);
-+		netdev_info(dev, "Using random MAC address: %pM\n",
-+			    dev->dev_addr);
-+	}
- 	memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
- 
- 	SET_ETHTOOL_OPS(dev, &rtl8169_ethtool_ops);
--- 
-1.7.7.3
-
-  
---- linux-3.4/fs/unionfs/commonfops.c.org	2012-05-29 20:40:20.756489877 +0200
-+++ linux-3.4/fs/unionfs/commonfops.c	2012-05-29 21:07:12.021252743 +0200
-@@ -766,7 +766,7 @@
- 				   unsigned int cmd, unsigned long arg)
- {
- 	int err = 0;
--	fd_set branchlist;
-+	unsigned long branchlist = 0;
- 	int bstart = 0, bend = 0, bindex = 0;
- 	int orig_bstart, orig_bend;
- 	struct dentry *dentry, *lower_dentry;
-@@ -781,14 +781,12 @@
- 	bstart = dbstart(dentry);
- 	bend = dbend(dentry);
+--- linux-4.14/security/selinux/include/classmap.h	2017-11-12 19:46:13.000000000 +0100
++++ linux-4.20/security/selinux/include/classmap.h	2018-12-24 00:55:59.000000000 +0100
+@@ -238,9 +238,11 @@
+ 	  { "access", NULL } },
+ 	{ "infiniband_endport",
+ 	  { "manage_subnet", NULL } },
++	{ "xdp_socket",
++	  { COMMON_SOCK_PERMS, NULL } },
+ 	{ NULL }
+   };
  
--	FD_ZERO(&branchlist);
--
- 	for (bindex = bstart; bindex <= bend; bindex++) {
- 		lower_dentry = unionfs_lower_dentry_idx(dentry, bindex);
- 		if (!lower_dentry)
- 			continue;
- 		if (likely(lower_dentry->d_inode))
--			FD_SET(bindex, &branchlist);
-+			__set_bit(bindex, &branchlist);
- 		/* purge any lower objects after partial_lookup */
- 		if (bindex < orig_bstart || bindex > orig_bend) {
- 			dput(lower_dentry);
+-#if PF_MAX > 44
++#if PF_MAX > 45
+ #error New address family defined, please update secclass_map.
+ #endif