debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

Drop ABI maintenance patches 

We're bumping ABI in the next upload so don't need these.
This commit is contained in:
Ben Hutchings 2017-04-22 02:22:36 +01:00
parent 9c5f88b1f6
commit 74fdfed494
3 changed files with 0 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
debian/patches/debian/net-avoid-abi-change-for-min_header_len.patch vendored
View File

@ -1,61 +0,0 @@
From: Ben Hutchings <ben@decadent.org.uk>
Date: Sat, 18 Feb 2017 21:22:41 +0000
Subject: net: Avoid ABI change for min_header_len
Forwarded: not-needed
Adding net_device::min_header_len is a massive ABI break that we don't
want right now. Instead, check for the specific device types and
minimum length in dev_validate_header().
---
--- a/drivers/net/loopback.c
+++ b/drivers/net/loopback.c
@@ -164,7 +164,6 @@ static void loopback_setup(struct net_de
{
dev->mtu = 64 * 1024;
dev->hard_header_len = ETH_HLEN; /* 14 */
- dev->min_header_len = ETH_HLEN; /* 14 */
dev->addr_len = ETH_ALEN; /* 6 */
dev->type = ARPHRD_LOOPBACK; /* 0x0001*/
dev->flags = IFF_LOOPBACK;
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -1508,7 +1508,6 @@ enum netdev_priv_flags {
* @mtu: Interface MTU value
* @type: Interface hardware type
* @hard_header_len: Maximum hardware header length.
- * @min_header_len: Minimum hardware header length
*
* @needed_headroom: Extra headroom the hardware may need, but not in all
* cases can this be guaranteed
@@ -1729,7 +1728,6 @@ struct net_device {
unsigned int mtu;
unsigned short type;
unsigned short hard_header_len;
- unsigned short min_header_len;
unsigned short needed_headroom;
unsigned short needed_tailroom;
@@ -2785,7 +2783,11 @@ static inline bool dev_validate_header(c
{
if (likely(len >= dev->hard_header_len))
return true;
- if (len < dev->min_header_len)
+ if ((dev->type == 1 /*ARPHRD_ETHER*/ ||
+ dev->type == 772 /*ARPHRD_LOOPBACK*/ ||
+ dev->type == 801 /*ARPHRD_IEEE80211*/ ||
+ dev->type == 803 /*ARPHRD_IEEE80211_RADIOTAP*/) &&
+ len < 14 /*ETH_HLEN*/)
return false;
if (capable(CAP_SYS_RAWIO)) {
--- a/net/ethernet/eth.c
+++ b/net/ethernet/eth.c
@@ -356,7 +356,6 @@ void ether_setup(struct net_device *dev)
dev->header_ops = &eth_header_ops;
dev->type = ARPHRD_ETHER;
dev->hard_header_len = ETH_HLEN;
- dev->min_header_len = ETH_HLEN;
dev->mtu = ETH_DATA_LEN;
dev->addr_len = ETH_ALEN;
dev->tx_queue_len = 1000; /* Ethernet wants good queues */

24
debian/patches/debian/userns-avoid-abi-change-for-cve-2017-6874-fix.patch vendored
View File

@ -1,24 +0,0 @@
From: Ben Hutchings <ben@decadent.org.uk>
Date: Tue, 14 Mar 2017 21:35:33 +0000
Subject: userns: Avoid ABI change for CVE-2017-6874 fix
Forwarded: not-needed
The type of ucounts::count changed from atomic_t to int. But they're
the same size, and it's only accessed within kernel/ucount.c, so hide
the change from genksyms.
---
--- a/include/linux/user_namespace.h
+++ b/include/linux/user_namespace.h
@@ -65,7 +65,11 @@ struct ucounts {
struct hlist_node node;
struct user_namespace *ns;
kuid_t uid;
+#ifdef __GENKSYMS__
+ atomic_t count;
+#else
int count;
+#endif
atomic_t ucount[UCOUNT_COUNTS];
};

2
debian/patches/series vendored
View File

@ -120,8 +120,6 @@ bugfix/powerpc/powerpc-fix-missing-crcs-add-yet-more-asm-prototypes.patch
bugfix/all/module-disable-matching-missing-version-crc.patch
# ABI maintenance
debian/net-avoid-abi-change-for-min_header_len.patch
debian/userns-avoid-abi-change-for-cve-2017-6874-fix.patch
# Tools bug fixes
bugfix/all/usbip-document-tcp-wrappers.patch