diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2010-10-26 11:52:45 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2010-10-26 11:53:31 +0000 |
commit | a84ec7e33c2164614d040fd9d52d2486e6ecfe4e (patch) | |
tree | e2e4f48cf6c9814fa7e8b1ce7f322fadd40577f0 | |
parent | 5681d3921e4d545c854829ec55980d95524bdf23 (diff) | |
download | alpine_aports-a84ec7e33c2164614d040fd9d52d2486e6ecfe4e.tar.bz2 alpine_aports-a84ec7e33c2164614d040fd9d52d2486e6ecfe4e.tar.xz alpine_aports-a84ec7e33c2164614d040fd9d52d2486e6ecfe4e.zip |
main/linux-grsec: remove patches that got applied upstream
3 files changed, 1 insertions, 88 deletions
diff --git a/main/linux-grsec/0011-xfrm_user-verify-policy-direction-at-XFRM_MSG_POLEXP.patch b/main/linux-grsec/0011-xfrm_user-verify-policy-direction-at-XFRM_MSG_POLEXP.patch deleted file mode 100644 index ae2a0f9100..0000000000 --- a/main/linux-grsec/0011-xfrm_user-verify-policy-direction-at-XFRM_MSG_POLEXP.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | From 5b3e87bccb0e48f2f8b78695e949c015a3695f8e Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> | ||
3 | Date: Wed, 31 Mar 2010 00:17:04 +0000 | ||
4 | Subject: [PATCH 11/18] xfrm_user: verify policy direction at XFRM_MSG_POLEXPIRE handler | ||
5 | |||
6 | Add missing check for policy direction verification. This is | ||
7 | especially important since without this xfrm_user may end up | ||
8 | deleting per-socket policy which is not allowed. | ||
9 | |||
10 | Signed-off-by: Timo Teras <timo.teras@iki.fi> | ||
11 | Acked-by: Herbert Xu <herbert@gondor.apana.org.au> | ||
12 | Signed-off-by: David S. Miller <davem@davemloft.net> | ||
13 | (cherry picked from commit c8bf4d04f970fafb3430d332533e1cf103f2a018) | ||
14 | --- | ||
15 | net/xfrm/xfrm_user.c | 4 ++++ | ||
16 | 1 files changed, 4 insertions(+), 0 deletions(-) | ||
17 | |||
18 | diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c | ||
19 | index b95a2d6..d1e9ee3 100644 | ||
20 | --- a/net/xfrm/xfrm_user.c | ||
21 | +++ b/net/xfrm/xfrm_user.c | ||
22 | @@ -1589,6 +1589,10 @@ static int xfrm_add_pol_expire(struct sk_buff *skb, struct nlmsghdr *nlh, | ||
23 | if (err) | ||
24 | return err; | ||
25 | |||
26 | + err = verify_policy_dir(p->dir); | ||
27 | + if (err) | ||
28 | + return err; | ||
29 | + | ||
30 | if (p->index) | ||
31 | xp = xfrm_policy_byid(net, type, p->dir, p->index, 0, &err); | ||
32 | else { | ||
33 | -- | ||
34 | 1.7.0.2 | ||
35 | |||
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD index d557959e66..37da9f8952 100644 --- a/main/linux-grsec/APKBUILD +++ b/main/linux-grsec/APKBUILD | |||
@@ -4,7 +4,7 @@ _flavor=grsec | |||
4 | pkgname=linux-${_flavor} | 4 | pkgname=linux-${_flavor} |
5 | pkgver=2.6.35.7 | 5 | pkgver=2.6.35.7 |
6 | _kernver=2.6.35 | 6 | _kernver=2.6.35 |
7 | pkgrel=0 | 7 | pkgrel=1 |
8 | pkgdesc="Linux kernel with grsecurity" | 8 | pkgdesc="Linux kernel with grsecurity" |
9 | url=http://grsecurity.net | 9 | url=http://grsecurity.net |
10 | depends="mkinitfs linux-firmware" | 10 | depends="mkinitfs linux-firmware" |
@@ -16,8 +16,6 @@ source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2 | |||
16 | ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2 | 16 | ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2 |
17 | grsecurity-2.2.0-2.6.35.7-201010232009.patch | 17 | grsecurity-2.2.0-2.6.35.7-201010232009.patch |
18 | 0004-arp-flush-arp-cache-on-device-change.patch | 18 | 0004-arp-flush-arp-cache-on-device-change.patch |
19 | 0011-xfrm_user-verify-policy-direction-at-XFRM_MSG_POLEXP.patch | ||
20 | r8169-fix-random-mdio_write-failures.patch | ||
21 | r8169-fix-rx-checksum-offload.patch | 19 | r8169-fix-rx-checksum-offload.patch |
22 | r8169-add-gro-support.patch | 20 | r8169-add-gro-support.patch |
23 | kernelconfig.x86 | 21 | kernelconfig.x86 |
@@ -143,8 +141,6 @@ md5sums="091abeb4684ce03d1d936851618687b6 linux-2.6.35.tar.bz2 | |||
143 | 6a00ec267b0100f20a3fa900b97a5b7f patch-2.6.35.7.bz2 | 141 | 6a00ec267b0100f20a3fa900b97a5b7f patch-2.6.35.7.bz2 |
144 | 4a1ceddc62ff83b136f32dbab50e15f8 grsecurity-2.2.0-2.6.35.7-201010232009.patch | 142 | 4a1ceddc62ff83b136f32dbab50e15f8 grsecurity-2.2.0-2.6.35.7-201010232009.patch |
145 | 776adeeb5272093574f8836c5037dd7d 0004-arp-flush-arp-cache-on-device-change.patch | 143 | 776adeeb5272093574f8836c5037dd7d 0004-arp-flush-arp-cache-on-device-change.patch |
146 | 9f284c3fd5ab38cef4544efc1f50c6ba 0011-xfrm_user-verify-policy-direction-at-XFRM_MSG_POLEXP.patch | ||
147 | ce4a74190febe13713bab1b886dd5bee r8169-fix-random-mdio_write-failures.patch | ||
148 | 0ccecafd4123dcad0b0cd7787553d734 r8169-fix-rx-checksum-offload.patch | 144 | 0ccecafd4123dcad0b0cd7787553d734 r8169-fix-rx-checksum-offload.patch |
149 | 139b39da44ecb577275be53d7d365949 r8169-add-gro-support.patch | 145 | 139b39da44ecb577275be53d7d365949 r8169-add-gro-support.patch |
150 | f6b46f11945c77d01679c87e95d512ee kernelconfig.x86" | 146 | f6b46f11945c77d01679c87e95d512ee kernelconfig.x86" |
diff --git a/main/linux-grsec/r8169-fix-random-mdio_write-failures.patch b/main/linux-grsec/r8169-fix-random-mdio_write-failures.patch deleted file mode 100644 index 1e2beadd0f..0000000000 --- a/main/linux-grsec/r8169-fix-random-mdio_write-failures.patch +++ /dev/null | |||
@@ -1,48 +0,0 @@ | |||
1 | From 024a07bacf8287a6ddfa83e9d5b951c5e8b4070e Mon Sep 17 00:00:00 2001 | ||
2 | From: =?utf8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> | ||
3 | Date: Sun, 6 Jun 2010 15:38:47 -0700 | ||
4 | Subject: [PATCH 1/1] r8169: fix random mdio_write failures | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=utf8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Some configurations need delay between the "write completed" indication | ||
10 | and new write to work reliably. | ||
11 | |||
12 | Realtek driver seems to use longer delay when polling the "write complete" | ||
13 | bit, so it waits long enough between writes with high probability (but | ||
14 | could probably break too). This patch adds a new udelay to make sure we | ||
15 | wait unconditionally some time after the write complete indication. | ||
16 | |||
17 | This caused a regression with XID 18000000 boards when the board specific | ||
18 | phy configuration writing many mdio registers was added in commit | ||
19 | 2e955856ff (r8169: phy init for the 8169scd). Some of the configration | ||
20 | mdio writes would almost always fail, and depending on failure might leave | ||
21 | the PHY in non-working state. | ||
22 | |||
23 | Signed-off-by: Timo Teräs <timo.teras@iki.fi> | ||
24 | Acked-off-by: Francois Romieu <romieu@fr.zoreil.com> | ||
25 | Signed-off-by: David S. Miller <davem@davemloft.net> | ||
26 | --- | ||
27 | drivers/net/r8169.c | 5 +++++ | ||
28 | 1 files changed, 5 insertions(+), 0 deletions(-) | ||
29 | |||
30 | diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c | ||
31 | index 217e709..03a8318 100644 | ||
32 | --- a/drivers/net/r8169.c | ||
33 | +++ b/drivers/net/r8169.c | ||
34 | @@ -559,6 +559,11 @@ static void mdio_write(void __iomem *ioaddr, int reg_addr, int value) | ||
35 | break; | ||
36 | udelay(25); | ||
37 | } | ||
38 | + /* | ||
39 | + * Some configurations require a small delay even after the write | ||
40 | + * completed indication or the next write might fail. | ||
41 | + */ | ||
42 | + udelay(25); | ||
43 | } | ||
44 | |||
45 | static int mdio_read(void __iomem *ioaddr, int reg_addr) | ||
46 | -- | ||
47 | 1.7.1 | ||
48 | |||