[arch-commits] Commit in linux-lts/trunk (2 files)

[Bartłomiej Piotrowski]

    Date: Wednesday, August 13, 2014 @ 10:43:33
  Author: bpiotrowski
Revision: 219659

upgpkg: linux-lts 3.14.16-2

fix NULL pointer dereference in net/sctp (FS#41329)

Added:
  linux-lts/trunk/net-v2-net-sctp-inherit-auth_capable-on-INIT-collisions.patch
Modified:
  linux-lts/trunk/PKGBUILD

---------------------------------------------------------------+
 PKGBUILD                                                      |    9 +++++--
 net-v2-net-sctp-inherit-auth_capable-on-INIT-collisions.patch |   12 ++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-08-13 08:13:59 UTC (rev 219658)
+++ PKGBUILD	2014-08-13 08:43:33 UTC (rev 219659)
@@ -5,7 +5,7 @@
 pkgbase=linux-lts
 _srcname=linux-3.14
 pkgver=3.14.16
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.kernel.org/"
 license=('GPL2')
@@ -22,6 +22,7 @@
         '0002-module-allow-multiple-calls-to-MODULE_DEVICE_TABLE-p.patch'
         '0003-module-remove-MODULE_GENERIC_TABLE.patch'
         '0006-genksyms-fix-typeof-handling.patch'
+        'net-v2-net-sctp-inherit-auth_capable-on-INIT-collisions.patch'
         )
 # https://www.kernel.org/pub/linux/kernel/v3.x/sha256sums.asc
 sha256sums=('61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa'
@@ -33,7 +34,8 @@
             '6d72e14552df59e6310f16c176806c408355951724cd5b48a47bf01591b8be02'
             '52dec83a8805a8642d74d764494acda863e0aa23e3d249e80d4b457e20a3fd29'
             '65d58f63215ee3c5f9c4fc6bce36fc5311a6c7dbdbe1ad29de40647b47ff9c0d'
-            'cf2e7a2d00787f754028e7459688c2755a406e632ce48b60952fa4ff7ed6f4b7')
+            'cf2e7a2d00787f754028e7459688c2755a406e632ce48b60952fa4ff7ed6f4b7'
+            '7e5cd2df597ea9235c41957d019d6afd769213a068a4bfa38796b18abe048d25')
 
 _kernelname=${pkgbase#linux}
 
@@ -62,6 +64,9 @@
   # http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=dc53324060f324e8af6867f57bf4891c13c6ef18
   patch -p1 -i "${srcdir}/0006-genksyms-fix-typeof-handling.patch"
 
+  # fixes NULL pointer dereference in net/sctp
+  patch -p1 -i "${srcdir}"/net-v2-net-sctp-inherit-auth_capable-on-INIT-collisions.patch
+
   if [ "${CARCH}" = "x86_64" ]; then
     cat "${srcdir}/config.x86_64" > ./.config
   else

Added: net-v2-net-sctp-inherit-auth_capable-on-INIT-collisions.patch
===================================================================
--- net-v2-net-sctp-inherit-auth_capable-on-INIT-collisions.patch	                        (rev 0)
+++ net-v2-net-sctp-inherit-auth_capable-on-INIT-collisions.patch	2014-08-13 08:43:33 UTC (rev 219659)
@@ -0,0 +1,12 @@
+diff --git a/net/sctp/associola.c b/net/sctp/associola.c
+index 9de23a2..06a9ee6 100644
+--- a/net/sctp/associola.c
++++ b/net/sctp/associola.c
+@@ -1097,6 +1097,7 @@ void sctp_assoc_update(struct sctp_association *asoc,
+ 	asoc->c = new->c;
+ 	asoc->peer.rwnd = new->peer.rwnd;
+ 	asoc->peer.sack_needed = new->peer.sack_needed;
++	asoc->peer.auth_capable = new->peer.auth_capable;
+ 	asoc->peer.i = new->peer.i;
+ 	sctp_tsnmap_init(&asoc->peer.tsn_map, SCTP_TSN_MAP_INITIAL,
+ 			 asoc->peer.i.initial_tsn, GFP_ATOMIC);