drop a duplicated 4.4 stable patch

diff --git a/queue-4.4/netfilter-nfnetlink_acct-validate-nfacct_quota-param.patch b/queue-4.4/netfilter-nfnetlink_acct-validate-nfacct_quota-param.patch
index 20dfa02c345f89675a1aedf5c0ae5bfdb455471c..0faacdad6b72f0de2faf8ff7615c543d09c5e503 100644 (file)
--- a/queue-4.4/netfilter-nfnetlink_acct-validate-nfacct_quota-param.patch
+++ b/queue-4.4/netfilter-nfnetlink_acct-validate-nfacct_quota-param.patch
@@ -12,15 +12,14 @@ required to trigger the bug.
 Signed-off-by: Phil Turnbull <phil.turnbull@oracle.com>
 Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- net/netfilter/nfnetlink_acct.c | 2 ++
+ net/netfilter/nfnetlink_acct.c |    2 ++
  1 file changed, 2 insertions(+)
 
-diff --git a/net/netfilter/nfnetlink_acct.c b/net/netfilter/nfnetlink_acct.c
-index 088e8da06b00b..0f3cb410e42ee 100644
 --- a/net/netfilter/nfnetlink_acct.c
 +++ b/net/netfilter/nfnetlink_acct.c
-@@ -97,6 +97,8 @@ nfnl_acct_new(struct sock *nfnl, struct sk_buff *skb,
+@@ -97,6 +97,8 @@ nfnl_acct_new(struct sock *nfnl, struct
                        return -EINVAL;
                if (flags & NFACCT_F_OVERQUOTA)
                        return -EINVAL;
@@ -29,6 +28,3 @@ index 088e8da06b00b..0f3cb410e42ee 100644
  
                size += sizeof(u64);
        }
--- 
-2.20.1
-

diff --git a/queue-4.4/netfilter-nfnetlink_acct-validate-nfacct_quota-param.patch-161 b/queue-4.4/netfilter-nfnetlink_acct-validate-nfacct_quota-param.patch-161
deleted file mode 100644 (file)
index 20dfa02..0000000
--- a/queue-4.4/netfilter-nfnetlink_acct-validate-nfacct_quota-param.patch-161
+++ /dev/null
@@ -1,34 +0,0 @@
-From d84be8b32a68fa491a016af0afe387391209a69e Mon Sep 17 00:00:00 2001
-From: Phil Turnbull <phil.turnbull@oracle.com>
-Date: Tue, 3 May 2016 16:39:19 -0400
-Subject: netfilter: nfnetlink_acct: validate NFACCT_QUOTA parameter
-
-[ Upstream commit eda3fc50daa93b08774a18d51883c5a5d8d85e15 ]
-
-If a quota bit is set in NFACCT_FLAGS but the NFACCT_QUOTA parameter is
-missing then a NULL pointer dereference is triggered. CAP_NET_ADMIN is
-required to trigger the bug.
-
-Signed-off-by: Phil Turnbull <phil.turnbull@oracle.com>
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- net/netfilter/nfnetlink_acct.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/net/netfilter/nfnetlink_acct.c b/net/netfilter/nfnetlink_acct.c
-index 088e8da06b00b..0f3cb410e42ee 100644
---- a/net/netfilter/nfnetlink_acct.c
-+++ b/net/netfilter/nfnetlink_acct.c
-@@ -97,6 +97,8 @@ nfnl_acct_new(struct sock *nfnl, struct sk_buff *skb,
-                       return -EINVAL;
-               if (flags & NFACCT_F_OVERQUOTA)
-                       return -EINVAL;
-+              if ((flags & NFACCT_F_QUOTA) && !tb[NFACCT_QUOTA])
-+                      return -EINVAL;
- 
-               size += sizeof(u64);
-       }
--- 
-2.20.1
-

diff --git a/queue-4.4/series b/queue-4.4/series
index aa4ca1fe98d55aca21c187929a3f7c341fba9cce..31c18054a78425d3510d34df8cc24106c489f5d0 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -1,7 +1,6 @@
 arm64-cpufeature-fix-ctr_el0-field-definitions.patch
 arm64-cpufeature-fix-feature-comparison-for-ctr_el0..patch
 netfilter-nfnetlink_acct-validate-nfacct_quota-param.patch
-netfilter-nfnetlink_acct-validate-nfacct_quota-param.patch-161
 hid-add-quirk-for-hp-x1200-pixart-oem-mouse.patch
 tcp-be-more-careful-in-tcp_fragment.patch
 atm-iphase-fix-spectre-v1-vulnerability.patch