summaryrefslogtreecommitdiffstats
path: root/recipes-kernel/linux/files/net-sctp-CVE-2014-0101.patch
diff options
context:
space:
mode:
authorTing Liu <ting.liu@freescale.com>2015-07-17 15:17:38 +0800
committerZhenhua Luo <zhenhua.luo@freescale.com>2015-07-22 17:37:56 +0800
commit2d6e98e65e028f15019a085f5e705496a1c90175 (patch)
tree7c3437c73689cc06bec53e75e62c9dfaa48afc99 /recipes-kernel/linux/files/net-sctp-CVE-2014-0101.patch
parentc1a8932311a95a541da41de0b8095c8e0cc374d1 (diff)
downloadmeta-fsl-ppc-2d6e98e65e028f15019a085f5e705496a1c90175.tar.gz
linux-qoriq: update to revision f488de6
Minor version update to 3.12.37-rt51 with new features: * e6500 hugepage TLB miss performance improvement * T1023RDB support * T1040D4RDB and T1042D4RDB support * DIU [T1042] * DPAA Ethernet: loadable module * eMMC: DDR mode [T2080] * eTSEC: Gianfar upstream updates and fixes * fmlib: table statistics, stats extension * IEEE802.1AE (MACSEC) and IEEE802.1X (port-based network access control) [T104x, T102x] * IEEE1588 ptpd open source stack includes more DPAA processors: P1023, P2041, P3041, P5020, P5040, T4240, T1023 * LAG SGMII 2.5G ports support - IPv4 traffics forwarding on aggregated 2 x 2.5Gb L2 Switch FMAN ports [1040] * LAG support of IPv6 traffics forwarding and TCP/UDP traffics over IPv6 forwarding (2 x 2.5Gb L2 Switch WAN) [1040] * LAG support of IPv6 traffics forwarding and TCP/UDP traffics over IPv6 forwarding on both 1 G RGMII port and 1G SGMII port [1040] * Power Management: Power off feature for all QDS boards except B9132QDS and B4860QDS * SEC: QI Driver IPSec performance improvement * SGMII 2.5G fixed link [T1024] * USB: Dual UTMI For detailed history, see http://git.freescale.com/git/cgit.cgi/ppc/sdk/linux.git/tag/?id=fsl-sdk-v1.8 Also remove the patches which already merged in 3.12.37-rt51 Signed-off-by: Ting Liu <ting.liu@freescale.com> Acked-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-kernel/linux/files/net-sctp-CVE-2014-0101.patch')
-rw-r--r--recipes-kernel/linux/files/net-sctp-CVE-2014-0101.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes-kernel/linux/files/net-sctp-CVE-2014-0101.patch b/recipes-kernel/linux/files/net-sctp-CVE-2014-0101.patch
index 6fc5610..ddcb6c5 100644
--- a/recipes-kernel/linux/files/net-sctp-CVE-2014-0101.patch
+++ b/recipes-kernel/linux/files/net-sctp-CVE-2014-0101.patch
@@ -126,9 +126,9 @@ diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
126index dfe3f36..56ebe71 100644 126index dfe3f36..56ebe71 100644
127--- a/net/sctp/sm_statefuns.c 127--- a/net/sctp/sm_statefuns.c
128+++ b/net/sctp/sm_statefuns.c 128+++ b/net/sctp/sm_statefuns.c
129@@ -759,6 +759,13 @@ sctp_disposition_t sctp_sf_do_5_1D_ce(struct net *net, 129@@ -768,6 +768,13 @@ sctp_disposition_t sctp_sf_do_5_1D_ce(struct net *net,
130 struct sctp_chunk auth; 130 return sctp_sf_pdiscard(net, ep, asoc, type, arg, commands);
131 sctp_ierror_t ret; 131 }
132 132
133+ /* Make sure that we and the peer are AUTH capable */ 133+ /* Make sure that we and the peer are AUTH capable */
134+ if (!net->sctp.auth_enable || !new_asoc->peer.auth_capable) { 134+ if (!net->sctp.auth_enable || !new_asoc->peer.auth_capable) {