rpms/kernel
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Linux v5.2.7

Browse source
This commit is contained in:
Justin M. Forbes 2019-08-07 23:56:09 -05:00
commit ae17795317
3 changed files with 109 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

99
1-1-netfilter-nf_tables-fix-module-autoload-for-redir.patch Normal file
View file

@ -0,0 +1,99 @@
From patchwork Wed Jul 10 23:31:12 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Christian Hesse <mail@eworm.de>
X-Patchwork-Id: 1130590
X-Patchwork-Delegate: pablo@netfilter.org
Return-Path: <netfilter-devel-owner@vger.kernel.org>
X-Original-To: incoming@patchwork.ozlabs.org
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
Authentication-Results: ozlabs.org;
spf=none (mailfrom) smtp.mailfrom=vger.kernel.org
(client-ip=209.132.180.67; helo=vger.kernel.org;
envelope-from=netfilter-devel-owner@vger.kernel.org;
receiver=<UNKNOWN>)
Authentication-Results: ozlabs.org;
dmarc=none (p=none dis=none) header.from=eworm.de
Authentication-Results: ozlabs.org; dkim=pass (1024-bit key;
unprotected) header.d=eworm.de header.i=@eworm.de header.b="ZrrXhpkA";
dkim-atps=neutral
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
by ozlabs.org (Postfix) with ESMTP id 45kbHB1BVMz9s3l
for <incoming@patchwork.ozlabs.org>;
Thu, 11 Jul 2019 09:38:46 +1000 (AEST)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S1727625AbfGJXip (ORCPT <rfc822;incoming@patchwork.ozlabs.org>);
Wed, 10 Jul 2019 19:38:45 -0400
Received: from mx.mylinuxtime.de ([195.201.174.144]:59434 "EHLO
mx.mylinuxtime.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S1727220AbfGJXio (ORCPT
<rfc822;netfilter-devel@vger.kernel.org>);
Wed, 10 Jul 2019 19:38:44 -0400
X-Greylist: delayed 410 seconds by postgrey-1.27 at vger.kernel.org;
Wed, 10 Jul 2019 19:38:44 EDT
Received: from leda.eworm.de (p5b101f53.dip0.t-ipconnect.de [91.16.31.83])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
(No client certificate requested)
by mx.mylinuxtime.de (Postfix) with ESMTPSA id 48C1215F924;
Thu, 11 Jul 2019 01:31:53 +0200 (CEST)
DKIM-Filter: OpenDKIM Filter v2.10.3 mx.mylinuxtime.de 48C1215F924
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=eworm.de; s=mail;
t=1562801513; bh=V/OQmi6tn1BXzNYfG/lvuYyRqgrfTgpxiaY1dc/jHR8=;
h=From:To:Cc:Subject:Date;
b=ZrrXhpkA5q/UgPfnVeFmkVHMQLy67G47i6vb94yetpG3Kg7TEDMQ6UrBuEENxQeLi
9obFbe/DKXCu3AQ1IWJ7yNrgdzm8nIOojUUVXus+Sv5+CDLS+AzKRrGhw9HHkiHld8
TMQb8JpxgQPS/dG+Ggbf4W5NfRHLV2bXMPDDb01M=
Received: by leda.eworm.de (Postfix, from userid 1000)
id 0419D1206E7; Thu, 11 Jul 2019 01:31:23 +0200 (CEST)
From: Christian Hesse <mail@eworm.de>
To: netfilter-devel@vger.kernel.org
Cc: Pablo Neira Ayuso <pablo@netfilter.org>, Christian Hesse <mail@eworm.de>
Subject: [PATCH 1/1] netfilter: nf_tables: fix module autoload for redir
Date: Thu, 11 Jul 2019 01:31:12 +0200
Message-Id: <20190710233112.3652-1-mail@eworm.de>
X-Mailer: git-send-email 2.22.0
MIME-Version: 1.0
X-Spam-Status: No, score=2.32
X-Spamd-Bar: ++
Authentication-Results: mx.mylinuxtime.de;
auth=pass smtp.auth=smtp-only@eworm.de
smtp.mailfrom=eworm@leda.eworm.de
X-Rspamd-Server: mx
X-Spam-Level: **
X-Stat-Signature: bmrmj1jf3ik6r5raom9soxknjbc7ozdy
X-Rspamd-Queue-Id: 48C1215F924
X-Spamd-Result: default: False [2.32 / 15.00]; ARC_NA(0.00)[];
RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[];
RCPT_COUNT_THREE(0.00)[3]; TO_DN_SOME(0.00)[];
TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain];
R_MISSING_CHARSET(2.50)[]; BROKEN_CONTENT_TYPE(1.50)[];
MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM(-2.88)[-0.959,0];
FORGED_SENDER(0.30)[mail@eworm.de,eworm@leda.eworm.de];
RCVD_TLS_LAST(0.00)[];
ASN(0.00)[asn:3320, ipnet:91.0.0.0/10, country:DE];
FROM_NEQ_ENVFROM(0.00)[mail@eworm.de,eworm@leda.eworm.de];
RCVD_COUNT_TWO(0.00)[2]
Sender: netfilter-devel-owner@vger.kernel.org
Precedence: bulk
List-ID: <netfilter-devel.vger.kernel.org>
X-Mailing-List: netfilter-devel@vger.kernel.org
Fix expression for autoloading.
Fixes: 5142967ab524 ("netfilter: nf_tables: fix module autoload with inet family")
Signed-off-by: Christian Hesse <mail@eworm.de>
---
net/netfilter/nft_redir.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/netfilter/nft_redir.c b/net/netfilter/nft_redir.c
index 8487eeff5c0e..43eeb1f609f1 100644
--- a/net/netfilter/nft_redir.c
+++ b/net/netfilter/nft_redir.c
@@ -291,4 +291,4 @@ module_exit(nft_redir_module_exit);
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Arturo Borrero Gonzalez <arturo@debian.org>");
-MODULE_ALIAS_NFT_EXPR("nat");
+MODULE_ALIAS_NFT_EXPR("redir");

10
kernel.spec
View file

@ -56,7 +56,7 @@ Summary: The Linux kernel
%if 0%{?released_kernel}
# Do we have a -stable update to apply?
%define stable_update 6
%define stable_update 7
# Set rpm version accordingly
%if 0%{?stable_update}
%define stablerev %{stable_update}
@ -598,6 +598,10 @@ Patch535: 0001-Revert-for-bz-1737046.patch
# rhbz 1730762
Patch526: HID-input-fix-a4tech-horizontal-wheel-custom-usage.patch
# rhbz 1737171
Patch527: 1-1-netfilter-nf_tables-fix-module-autoload-for-redir.patch
# END OF PATCH DEFINITIONS
%endif
@ -1836,6 +1840,10 @@ fi
#
#
%changelog
* Thu Aug 08 2019 Justin M. Forbes <jforbes@redhat.com> - 5.2.7-200
- Linux v5.2.7
- Fix netfilter regression (rhbz 1737171)
* Mon Aug 05 2019 Justin M. Forbes <jforbes@fedoraproject.org> - 5.2.6-100
- Linux v5.2.6 rebase

2
sources
View file

@ -1,2 +1,2 @@
SHA512 (linux-5.2.tar.xz) = 5a28f8a34c4e0470617f5638b7112e6252109b78f23b1eed484a228530970c7ef5c130d6e5a09cf25ea2f6a0329602dcc1ec66ce893182e15b27d99bd228789c
SHA512 (patch-5.2.6.xz) = d3da691d721a0edf4f539ad991664234d4454b011b649534f28db2fcad489268eced46ebe697b2a350336ced8e0de6cd8ceed5e43361e3b0d4cc794caf3c62e4
SHA512 (patch-5.2.7.xz) = e9f1b42ab0f39e170237b0ef4244cf866f1e0901bfc826c71d67647175aad895efe24a633555ebcd46809ecc124396d6be3d862483156044273ab3a0ca0c84b8