X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fgrsecurity-scrape.git;a=blobdiff_plain;f=test%2Fchangelog-test.txt;h=0982e4bd65efdf645643dbd0c0d6f6b0b99e7b61;hp=a662590c963d7e51ed0c55bf9b30abd531fb6bd7;hb=8a3260fb7b3ac436c7c9075534b1c7d81b70d14d;hpb=f77a837ca1a1ff92eb9197e3bba6a09c829f091d

diff --git a/test/changelog-test.txt b/test/changelog-test.txt
index a662590..0982e4b 100644
--- a/test/changelog-test.txt
+++ b/test/changelog-test.txt
@@ -1,3 +1,95 @@
+commit 0ce9a7532015fd64e56ff017bac5448719c6caa8
+Merge: 3648fb5 28fc0cc
+Author: Brad Spengler <spender@grsecurity.net>
+Date:   Sat Mar 18 07:41:49 2017 -0400
+
+    Merge branch 'pax-test' into grsec-test
+
+commit 28fc0cc540a02524aa7122c4b6518f46be150670
+Merge: 51fb02c 8a16224
+Author: Brad Spengler <spender@grsecurity.net>
+Date:   Sat Mar 18 07:41:36 2017 -0400
+
+    Merge branch 'linux-4.9.y' into pax-test
+
+commit 3648fb58cc16ec3a1c86269ffbdf6ee8f2ff857d
+Author: Brad Spengler <spender@grsecurity.net>
+Date:   Wed Mar 15 00:10:53 2017 -0400
+
+    compile fix
+
+commit 5ae0984f1a67bddf7315c071b7df971e4b03072e
+Merge: c9a77fb 51fb02c
+Author: Brad Spengler <spender@grsecurity.net>
+Date:   Tue Mar 14 23:38:35 2017 -0400
+
+    Merge branch 'pax-test' into grsec-test
+
+commit 51fb02c0abebafc624a60da2e68b77a4dcad448f
+Merge: 5fedde5 d962bf8
+Author: Brad Spengler <spender@grsecurity.net>
+Date:   Tue Mar 14 23:38:26 2017 -0400
+
+    Merge branch 'linux-4.9.y' into pax-test
+
+commit c9a77fb1a803a00e7ff0026ad9a87ccb7f9c3004
+Author: Brad Spengler <spender@grsecurity.net>
+Date:   Sun Mar 12 12:11:47 2017 -0400
+
+    Update size_overflow hash table
+
+commit 643aa0cade896df02b42428785e5cc6cb8bc2c9c
+Author: Alexander Popov <alex.popov@linux.com>
+Date:   Tue Feb 28 19:54:40 2017 +0300
+
+    tty: n_hdlc: get rid of racy n_hdlc.tbuf
+    
+    Currently N_HDLC line discipline uses a self-made singly linked list for
+    data buffers and has n_hdlc.tbuf pointer for buffer retransmitting after
+    an error.
+    
+    The commit be10eb7589337e5defbe214dae038a53dd21add8
+    ("tty: n_hdlc add buffer flushing") introduced racy access to n_hdlc.tbuf.
+    After tx error concurrent flush_tx_queue() and n_hdlc_send_frames() can put
+    one data buffer to tx_free_buf_list twice. That causes double free in
+    n_hdlc_release().
+    
+    Let's use standard kernel linked list and get rid of n_hdlc.tbuf:
+    in case of tx error put current data buffer after the head of tx_buf_list.
+    
+    Signed-off-by: Alexander Popov <alex.popov@linux.com>
+    Cc: stable <stable@vger.kernel.org>
+    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+commit 0c801f1c89b85170505c8dac6c58df27155dbb1e
+Merge: a0b31dd 5fedde5
+Author: Brad Spengler <spender@grsecurity.net>
+Date:   Sun Mar 12 08:18:58 2017 -0400
+
+    Merge branch 'pax-test' into grsec-test
+
+commit 5fedde5358a3a9625c4e21ff8a5b5b6d5bd5d125
+Merge: c8102ee d379ab2
+Author: Brad Spengler <spender@grsecurity.net>
+Date:   Sun Mar 12 08:18:48 2017 -0400
+
+    Merge branch 'linux-4.9.y' into pax-test
+
+commit a0b31ddd80510c595b1db203edd009a721e68cfa
+Merge: f9c6bb9 c8102ee
+Author: Brad Spengler <spender@grsecurity.net>
+Date:   Sun Mar 5 18:02:18 2017 -0500
+
+    Merge branch 'pax-test' into grsec-test
+
+commit c8102eef049988a1905817e4dc4e859287c2923e
+Author: Brad Spengler <spender@grsecurity.net>
+Date:   Sun Mar 5 18:01:22 2017 -0500
+
+    Update to pax-linux-4.9.13-test6.patch:
+    - fixed a regression where on amd64 STACKLEAK instrumented functions executed in IRQ context caused a preempt counter overdecrement, by Jason A. Donenfeld <Jason@zx2c4.com>, reported by nail (https://forums.grsecurity.net/viewtopic.php?f=3&t=4668)
+    - fixed an unbalanced pax_open_kernel call that would trigger a BUG in the zt5550 driver
+
 commit f9c6bb92aa1205f0402085e363fa914ea34beceb
 Author: Brad Spengler <spender@grsecurity.net>
 Date:   Mon Feb 27 06:55:25 2017 -0500