From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 71434e5b4abd45f59a9ab9d519c38f29d471dbc2
Date: Mon, 22 Aug 2016 06:28:28 +0100 [thread overview]
Message-ID: <20160822052829.C3E011078E81@git01.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 2846 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 71434e5b4abd45f59a9ab9d519c38f29d471dbc2 (commit)
via 69f3684cf5337d34963b1ee6a5c8ac2072c6eaf6 (commit)
from 53aad60d6f35b622ea571faf3fc1c5d4ee28e1f0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 71434e5b4abd45f59a9ab9d519c38f29d471dbc2
Merge: 53aad60 69f3684
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Aug 22 07:26:37 2016 +0200
Merge branch 'core104' into next
-----------------------------------------------------------------------
Summary of changes:
lfs/linux | 1 +
.../linux-3.14.77-gsrec_tcp_input_access_once_rw.patch | 18 ++++++++++++++++++
2 files changed, 19 insertions(+)
create mode 100644 src/patches/linux-3.14.77-gsrec_tcp_input_access_once_rw.patch
Difference in files:
diff --git a/lfs/linux b/lfs/linux
index 5c37a4b..e365be6 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -132,6 +132,7 @@ ifneq "$(KCFG)" "-headers"
cd $(DIR_APP) && xz -c -d $(DIR_DL)/$(GRS_PATCHES) | patch -Np1
cd $(DIR_APP) && rm localversion-grsec
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.7-disable-compat_vdso.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.77-gsrec_tcp_input_access_once_rw.patch
endif
# DVB Patches
diff --git a/src/patches/linux-3.14.77-gsrec_tcp_input_access_once_rw.patch b/src/patches/linux-3.14.77-gsrec_tcp_input_access_once_rw.patch
new file mode 100644
index 0000000..19d0448
--- /dev/null
+++ b/src/patches/linux-3.14.77-gsrec_tcp_input_access_once_rw.patch
@@ -0,0 +1,18 @@
+diff -Naur linux-3.14.77.org/net/ipv4/tcp_input.c linux-3.14.77/net/ipv4/tcp_input.c
+--- linux-3.14.77.org/net/ipv4/tcp_input.c 2016-08-21 19:58:45.000000000 +0200
++++ linux-3.14.77/net/ipv4/tcp_input.c 2016-08-21 21:11:24.336757369 +0200
+@@ -3299,12 +3299,12 @@
+ u32 half = (sysctl_tcp_challenge_ack_limit + 1) >> 1;
+
+ challenge_timestamp = now;
+- ACCESS_ONCE(challenge_count) = half +
++ ACCESS_ONCE_RW(challenge_count) = half +
+ prandom_u32_max(sysctl_tcp_challenge_ack_limit);
+ }
+ count = ACCESS_ONCE(challenge_count);
+ if (count > 0) {
+- ACCESS_ONCE(challenge_count) = count - 1;
++ ACCESS_ONCE_RW(challenge_count) = count - 1;
+ NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_TCPCHALLENGEACK);
+ tcp_send_ack(sk);
+ }
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2016-08-22 5:28 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160822052829.C3E011078E81@git01.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox