[linux] 01/01: net/sock: Add sock_efree() function

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

carnil pushed a commit to branch jessie-security
in repository linux.

commit 9c0afc858f33f6a316c07ac2bf0200013ff3f861
Author: Salvatore Bonaccorso <carnil at debian.org>
Date:   Tue Mar 7 19:13:52 2017 +0100

    net/sock: Add sock_efree() function
---
 debian/changelog                                   |  1 +
 .../bugfix/all/net-sock-add-sock_efree.patch       | 34 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 36 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9e62ba5..18ccb6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ linux (3.16.39-1+deb8u2) UNRELEASED; urgency=medium
   * sctp: deny peeloff operation on asocs with threads sleeping on it
     (CVE-2017-6353)
   * tcp: avoid infinite loop in tcp_splice_read() (CVE-2017-6214)
+  * net/sock: Add sock_efree() function
   * net/llc: avoid BUG_ON() in skb_orphan() (CVE-2017-6345)
   * packet: fix races in fanout_add() (CVE-2017-6346)
 
diff --git a/debian/patches/bugfix/all/net-sock-add-sock_efree.patch b/debian/patches/bugfix/all/net-sock-add-sock_efree.patch
new file mode 100644
index 0000000..e239e14
--- /dev/null
+++ b/debian/patches/bugfix/all/net-sock-add-sock_efree.patch
@@ -0,0 +1,34 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Subject: net/sock: Add sock_efree() function
+Date: Fri, 03 Mar 2017 02:32:07 +0000
+
+Extracted from commit 62bccb8cdb69 ("net-timestamp: Make the clone operation
+stand-alone from phy timestamping").
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+---
+--- a/include/net/sock.h
++++ b/include/net/sock.h
+@@ -1569,6 +1569,7 @@ struct sk_buff *sock_wmalloc(struct sock
+ void sock_wfree(struct sk_buff *skb);
+ void skb_orphan_partial(struct sk_buff *skb);
+ void sock_rfree(struct sk_buff *skb);
++void sock_efree(struct sk_buff *skb);
+ void sock_edemux(struct sk_buff *skb);
+ 
+ int sock_setsockopt(struct socket *sock, int level, int op,
+--- a/net/core/sock.c
++++ b/net/core/sock.c
+@@ -1678,6 +1678,12 @@ void sock_rfree(struct sk_buff *skb)
+ }
+ EXPORT_SYMBOL(sock_rfree);
+ 
++void sock_efree(struct sk_buff *skb)
++{
++	sock_put(skb->sk);
++}
++EXPORT_SYMBOL(sock_efree);
++
+ void sock_edemux(struct sk_buff *skb)
+ {
+ 	struct sock *sk = skb->sk;
diff --git a/debian/patches/series b/debian/patches/series
index 2d95fa9..58486aa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -697,6 +697,7 @@ bugfix/all/ipc-shm-Fix-shmat-mmap-nil-page-protection.patch
 bugfix/all/sctp-avoid-BUG_ON-on-sctp_wait_for_sndbuf.patch
 bugfix/all/sctp-deny-peeloff-operation-on-asocs-with-threads-sl.patch
 bugfix/all/tcp-avoid-infinite-loop-in-tcp_splice_read.patch
+bugfix/all/net-sock-add-sock_efree.patch
 bugfix/all/net-llc-avoid-BUG_ON-in-skb_orphan.patch
 bugfix/all/packet-fix-races-in-fanout_add.patch
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git