forked from lede-project/source
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refresh patches. Remove upstreamed patches: target/linux/generic/patches-4.4/030-2-smsc75xx-use-skb_cow_head-to-deal-with-cloned-skbs.patch target/linux/generic/patches-4.4/030-3-cx82310_eth-use-skb_cow_head-to-deal-with-cloned-skb.patch target/linux/generic/patches-4.4/030-4-sr9700-use-skb_cow_head-to-deal-with-cloned-skbs.patch target/linux/generic/patches-4.4/030-5-lan78xx-use-skb_cow_head-to-deal-with-cloned-skbs.patch CVEs completely or partially addressed: CVE-2017-5715 CVE-2017-5753 CVE-2017-17741 CVE-2017-1000410 Compile-tested: ar71xx Archer C7 v2 Run-tested: ar71xx Archer C7 v2 Signed-off-by: Kevin Darbyshire-Bryant <[email protected]>
- Loading branch information
Showing
12 changed files
with
19 additions
and
165 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
36 changes: 0 additions & 36 deletions
36
.../linux/generic/pending-4.4/030-2-smsc75xx-use-skb_cow_head-to-deal-with-cloned-skbs.patch
This file was deleted.
Oops, something went wrong.
35 changes: 0 additions & 35 deletions
35
...inux/generic/pending-4.4/030-3-cx82310_eth-use-skb_cow_head-to-deal-with-cloned-skb.patch
This file was deleted.
Oops, something went wrong.
37 changes: 0 additions & 37 deletions
37
...et/linux/generic/pending-4.4/030-4-sr9700-use-skb_cow_head-to-deal-with-cloned-skbs.patch
This file was deleted.
Oops, something went wrong.
38 changes: 0 additions & 38 deletions
38
...t/linux/generic/pending-4.4/030-5-lan78xx-use-skb_cow_head-to-deal-with-cloned-skbs.patch
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -296,15 +296,15 @@ Signed-off-by: Steven Barth <[email protected]> | |
|
||
__skb_tunnel_rx(skb, t->dev, t->net); | ||
|
||
@@ -1247,6 +1384,7 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, str | ||
@@ -1248,6 +1385,7 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, str | ||
__u32 mtu; | ||
u8 tproto; | ||
int err; | ||
+ struct __ip6_tnl_fmr *fmr; | ||
|
||
tproto = ACCESS_ONCE(t->parms.proto); | ||
if ((tproto != IPPROTO_IPV6 && tproto != 0) || | ||
@@ -1277,6 +1415,18 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, str | ||
@@ -1278,6 +1416,18 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, str | ||
if (t->parms.flags & IP6_TNL_F_USE_ORIG_FWMARK) | ||
fl6.flowi6_mark = skb->mark; | ||
|
||
|
@@ -323,7 +323,7 @@ Signed-off-by: Steven Barth <[email protected]> | |
err = ip6_tnl_xmit2(skb, dev, dsfield, &fl6, encap_limit, &mtu); | ||
if (err != 0) { | ||
if (err == -EMSGSIZE) | ||
@@ -1391,6 +1541,14 @@ ip6_tnl_change(struct ip6_tnl *t, const | ||
@@ -1392,6 +1542,14 @@ ip6_tnl_change(struct ip6_tnl *t, const | ||
t->parms.flowinfo = p->flowinfo; | ||
t->parms.link = p->link; | ||
t->parms.proto = p->proto; | ||
|
@@ -338,15 +338,15 @@ Signed-off-by: Steven Barth <[email protected]> | |
ip6_tnl_dst_reset(t); | ||
ip6_tnl_link_config(t); | ||
return 0; | ||
@@ -1429,6 +1587,7 @@ ip6_tnl_parm_from_user(struct __ip6_tnl_ | ||
@@ -1430,6 +1588,7 @@ ip6_tnl_parm_from_user(struct __ip6_tnl_ | ||
p->flowinfo = u->flowinfo; | ||
p->link = u->link; | ||
p->proto = u->proto; | ||
+ p->fmrs = NULL; | ||
memcpy(p->name, u->name, sizeof(u->name)); | ||
} | ||
|
||
@@ -1724,6 +1883,15 @@ static int ip6_tnl_validate(struct nlatt | ||
@@ -1725,6 +1884,15 @@ static int ip6_tnl_validate(struct nlatt | ||
return 0; | ||
} | ||
|
||
|
@@ -362,7 +362,7 @@ Signed-off-by: Steven Barth <[email protected]> | |
static void ip6_tnl_netlink_parms(struct nlattr *data[], | ||
struct __ip6_tnl_parm *parms) | ||
{ | ||
@@ -1755,6 +1923,46 @@ static void ip6_tnl_netlink_parms(struct | ||
@@ -1756,6 +1924,46 @@ static void ip6_tnl_netlink_parms(struct | ||
|
||
if (data[IFLA_IPTUN_PROTO]) | ||
parms->proto = nla_get_u8(data[IFLA_IPTUN_PROTO]); | ||
|
@@ -409,7 +409,7 @@ Signed-off-by: Steven Barth <[email protected]> | |
} | ||
|
||
static int ip6_tnl_newlink(struct net *src_net, struct net_device *dev, | ||
@@ -1807,6 +2015,12 @@ static void ip6_tnl_dellink(struct net_d | ||
@@ -1808,6 +2016,12 @@ static void ip6_tnl_dellink(struct net_d | ||
|
||
static size_t ip6_tnl_get_size(const struct net_device *dev) | ||
{ | ||
|
@@ -422,7 +422,7 @@ Signed-off-by: Steven Barth <[email protected]> | |
return | ||
/* IFLA_IPTUN_LINK */ | ||
nla_total_size(4) + | ||
@@ -1824,6 +2038,24 @@ static size_t ip6_tnl_get_size(const str | ||
@@ -1825,6 +2039,24 @@ static size_t ip6_tnl_get_size(const str | ||
nla_total_size(4) + | ||
/* IFLA_IPTUN_PROTO */ | ||
nla_total_size(1) + | ||
|
@@ -447,7 +447,7 @@ Signed-off-by: Steven Barth <[email protected]> | |
0; | ||
} | ||
|
||
@@ -1831,6 +2063,9 @@ static int ip6_tnl_fill_info(struct sk_b | ||
@@ -1832,6 +2064,9 @@ static int ip6_tnl_fill_info(struct sk_b | ||
{ | ||
struct ip6_tnl *tunnel = netdev_priv(dev); | ||
struct __ip6_tnl_parm *parm = &tunnel->parms; | ||
|
@@ -457,7 +457,7 @@ Signed-off-by: Steven Barth <[email protected]> | |
|
||
if (nla_put_u32(skb, IFLA_IPTUN_LINK, parm->link) || | ||
nla_put_in6_addr(skb, IFLA_IPTUN_LOCAL, &parm->laddr) || | ||
@@ -1839,8 +2074,27 @@ static int ip6_tnl_fill_info(struct sk_b | ||
@@ -1840,8 +2075,27 @@ static int ip6_tnl_fill_info(struct sk_b | ||
nla_put_u8(skb, IFLA_IPTUN_ENCAP_LIMIT, parm->encap_limit) || | ||
nla_put_be32(skb, IFLA_IPTUN_FLOWINFO, parm->flowinfo) || | ||
nla_put_u32(skb, IFLA_IPTUN_FLAGS, parm->flags) || | ||
|
@@ -486,7 +486,7 @@ Signed-off-by: Steven Barth <[email protected]> | |
return 0; | ||
|
||
nla_put_failure: | ||
@@ -1864,6 +2118,7 @@ static const struct nla_policy ip6_tnl_p | ||
@@ -1865,6 +2119,7 @@ static const struct nla_policy ip6_tnl_p | ||
[IFLA_IPTUN_FLOWINFO] = { .type = NLA_U32 }, | ||
[IFLA_IPTUN_FLAGS] = { .type = NLA_U32 }, | ||
[IFLA_IPTUN_PROTO] = { .type = NLA_U8 }, | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -34,7 +34,7 @@ Signed-off-by: Russell King <[email protected]> | |
case PHY_##_state: \ | ||
--- a/include/linux/phy.h | ||
+++ b/include/linux/phy.h | ||
@@ -812,6 +812,7 @@ int phy_ethtool_gset(struct phy_device * | ||
@@ -823,6 +823,7 @@ int phy_ethtool_gset(struct phy_device * | ||
int phy_ethtool_ioctl(struct phy_device *phydev, void *useraddr); | ||
int phy_mii_ioctl(struct phy_device *phydev, struct ifreq *ifr, int cmd); | ||
int phy_start_interrupts(struct phy_device *phydev); | ||
|