kerneL: bump 4.14 to 4.14.73
Refreshed all patches. Removed upstreamed: - 192-Revert-ubifs-xattr-Don-t-operate-on-deleted-inodes.patch Compile-tested on: cns3xxx, imx6, x86_64 Runtime-tested on: cns3xxx, imx6, x86_64 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
This commit is contained in:
		@@ -2,11 +2,11 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
LINUX_RELEASE?=1
 | 
					LINUX_RELEASE?=1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
LINUX_VERSION-4.14 = .72
 | 
					 | 
				
			||||||
LINUX_VERSION-4.9 = .130
 | 
					LINUX_VERSION-4.9 = .130
 | 
				
			||||||
 | 
					LINUX_VERSION-4.14 = .73
 | 
				
			||||||
 | 
					
 | 
				
			||||||
LINUX_KERNEL_HASH-4.14.72 = df925906250bbc40fcf0137d7ad0fb8edc528d926832634f1233b7540564557f
 | 
					 | 
				
			||||||
LINUX_KERNEL_HASH-4.9.130 = 60db3e6a8b00230d5a7c0c8907ef6876702e99c89980bb624f7b649b638b0a7f
 | 
					LINUX_KERNEL_HASH-4.9.130 = 60db3e6a8b00230d5a7c0c8907ef6876702e99c89980bb624f7b649b638b0a7f
 | 
				
			||||||
 | 
					LINUX_KERNEL_HASH-4.14.73 = 999e38141ccc447df7bf7ce10b8803c12b32274b76d3d5400bf3fd88eee0e31e
 | 
				
			||||||
 | 
					
 | 
				
			||||||
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
 | 
					remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
 | 
				
			||||||
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
 | 
					sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -26,7 +26,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
 | 
				
			|||||||
 struct dst_entry *ip6_dst_lookup_flow(const struct sock *sk, struct flowi6 *fl6,
 | 
					 struct dst_entry *ip6_dst_lookup_flow(const struct sock *sk, struct flowi6 *fl6,
 | 
				
			||||||
--- a/net/ipv6/ip6_output.c
 | 
					--- a/net/ipv6/ip6_output.c
 | 
				
			||||||
+++ b/net/ipv6/ip6_output.c
 | 
					+++ b/net/ipv6/ip6_output.c
 | 
				
			||||||
@@ -383,7 +383,7 @@ static inline int ip6_forward_finish(str
 | 
					@@ -381,7 +381,7 @@ static inline int ip6_forward_finish(str
 | 
				
			||||||
 	return dst_output(net, sk, skb);
 | 
					 	return dst_output(net, sk, skb);
 | 
				
			||||||
 }
 | 
					 }
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
@@ -35,7 +35,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
 | 
				
			|||||||
 {
 | 
					 {
 | 
				
			||||||
 	unsigned int mtu;
 | 
					 	unsigned int mtu;
 | 
				
			||||||
 	struct inet6_dev *idev;
 | 
					 	struct inet6_dev *idev;
 | 
				
			||||||
@@ -403,6 +403,7 @@ static unsigned int ip6_dst_mtu_forward(
 | 
					@@ -401,6 +401,7 @@ static unsigned int ip6_dst_mtu_forward(
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
 	return mtu;
 | 
					 	return mtu;
 | 
				
			||||||
 }
 | 
					 }
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -49,7 +49,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 | 
				
			|||||||
 struct dst_entry *ip6_dst_lookup_flow(const struct sock *sk, struct flowi6 *fl6,
 | 
					 struct dst_entry *ip6_dst_lookup_flow(const struct sock *sk, struct flowi6 *fl6,
 | 
				
			||||||
--- a/net/ipv6/ip6_output.c
 | 
					--- a/net/ipv6/ip6_output.c
 | 
				
			||||||
+++ b/net/ipv6/ip6_output.c
 | 
					+++ b/net/ipv6/ip6_output.c
 | 
				
			||||||
@@ -383,28 +383,6 @@ static inline int ip6_forward_finish(str
 | 
					@@ -381,28 +381,6 @@ static inline int ip6_forward_finish(str
 | 
				
			||||||
 	return dst_output(net, sk, skb);
 | 
					 	return dst_output(net, sk, skb);
 | 
				
			||||||
 }
 | 
					 }
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,96 +0,0 @@
 | 
				
			|||||||
From a99708737f566c70651015332e89d0d3b1eb5529 Mon Sep 17 00:00:00 2001
 | 
					 | 
				
			||||||
From: Koen Vandeputte <koen.vandeputte@ncentric.com>
 | 
					 | 
				
			||||||
Date: Mon, 17 Sep 2018 10:13:09 +0200
 | 
					 | 
				
			||||||
Subject: [PATCH] Revert "ubifs: xattr: Don't operate on deleted inodes"
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
This reverts commit 8a23348d76a1e7716da6e76383281ac82fc071cf.
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
UBIFS wants to assert that xattr operations are only issued on files
 | 
					 | 
				
			||||||
with positive link count. The said patch made this operations return
 | 
					 | 
				
			||||||
-ENOENT for unlinked files such that the asserts will no longer trigger.
 | 
					 | 
				
			||||||
This was wrong since xattr operations are perfectly fine on unlinked
 | 
					 | 
				
			||||||
files.
 | 
					 | 
				
			||||||
Instead the assertions need to be fixed/removed.
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
Fixes: 11a6fc3dc743 ("ubifs: xattr: Don't operate on deleted inodes")
 | 
					 | 
				
			||||||
Reported-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
 | 
					 | 
				
			||||||
Signed-off-by: Richard Weinberger <richard@nod.at>
 | 
					 | 
				
			||||||
---
 | 
					 | 
				
			||||||
 fs/ubifs/xattr.c | 24 ------------------------
 | 
					 | 
				
			||||||
 1 file changed, 24 deletions(-)
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
--- a/fs/ubifs/xattr.c
 | 
					 | 
				
			||||||
+++ b/fs/ubifs/xattr.c
 | 
					 | 
				
			||||||
@@ -152,12 +152,6 @@ static int create_xattr(struct ubifs_inf
 | 
					 | 
				
			||||||
 	ui->data_len = size;
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
 	mutex_lock(&host_ui->ui_mutex);
 | 
					 | 
				
			||||||
-
 | 
					 | 
				
			||||||
-	if (!host->i_nlink) {
 | 
					 | 
				
			||||||
-		err = -ENOENT;
 | 
					 | 
				
			||||||
-		goto out_noent;
 | 
					 | 
				
			||||||
-	}
 | 
					 | 
				
			||||||
-
 | 
					 | 
				
			||||||
 	host->i_ctime = current_time(host);
 | 
					 | 
				
			||||||
 	host_ui->xattr_cnt += 1;
 | 
					 | 
				
			||||||
 	host_ui->xattr_size += CALC_DENT_SIZE(fname_len(nm));
 | 
					 | 
				
			||||||
@@ -189,7 +183,6 @@ out_cancel:
 | 
					 | 
				
			||||||
 	host_ui->xattr_size -= CALC_XATTR_BYTES(size);
 | 
					 | 
				
			||||||
 	host_ui->xattr_names -= fname_len(nm);
 | 
					 | 
				
			||||||
 	host_ui->flags &= ~UBIFS_CRYPT_FL;
 | 
					 | 
				
			||||||
-out_noent:
 | 
					 | 
				
			||||||
 	mutex_unlock(&host_ui->ui_mutex);
 | 
					 | 
				
			||||||
 out_free:
 | 
					 | 
				
			||||||
 	make_bad_inode(inode);
 | 
					 | 
				
			||||||
@@ -241,12 +234,6 @@ static int change_xattr(struct ubifs_inf
 | 
					 | 
				
			||||||
 	mutex_unlock(&ui->ui_mutex);
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
 	mutex_lock(&host_ui->ui_mutex);
 | 
					 | 
				
			||||||
-
 | 
					 | 
				
			||||||
-	if (!host->i_nlink) {
 | 
					 | 
				
			||||||
-		err = -ENOENT;
 | 
					 | 
				
			||||||
-		goto out_noent;
 | 
					 | 
				
			||||||
-	}
 | 
					 | 
				
			||||||
-
 | 
					 | 
				
			||||||
 	host->i_ctime = current_time(host);
 | 
					 | 
				
			||||||
 	host_ui->xattr_size -= CALC_XATTR_BYTES(old_size);
 | 
					 | 
				
			||||||
 	host_ui->xattr_size += CALC_XATTR_BYTES(size);
 | 
					 | 
				
			||||||
@@ -268,7 +255,6 @@ static int change_xattr(struct ubifs_inf
 | 
					 | 
				
			||||||
 out_cancel:
 | 
					 | 
				
			||||||
 	host_ui->xattr_size -= CALC_XATTR_BYTES(size);
 | 
					 | 
				
			||||||
 	host_ui->xattr_size += CALC_XATTR_BYTES(old_size);
 | 
					 | 
				
			||||||
-out_noent:
 | 
					 | 
				
			||||||
 	mutex_unlock(&host_ui->ui_mutex);
 | 
					 | 
				
			||||||
 	make_bad_inode(inode);
 | 
					 | 
				
			||||||
 out_free:
 | 
					 | 
				
			||||||
@@ -497,12 +483,6 @@ static int remove_xattr(struct ubifs_inf
 | 
					 | 
				
			||||||
 		return err;
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
 	mutex_lock(&host_ui->ui_mutex);
 | 
					 | 
				
			||||||
-
 | 
					 | 
				
			||||||
-	if (!host->i_nlink) {
 | 
					 | 
				
			||||||
-		err = -ENOENT;
 | 
					 | 
				
			||||||
-		goto out_noent;
 | 
					 | 
				
			||||||
-	}
 | 
					 | 
				
			||||||
-
 | 
					 | 
				
			||||||
 	host->i_ctime = current_time(host);
 | 
					 | 
				
			||||||
 	host_ui->xattr_cnt -= 1;
 | 
					 | 
				
			||||||
 	host_ui->xattr_size -= CALC_DENT_SIZE(fname_len(nm));
 | 
					 | 
				
			||||||
@@ -522,7 +502,6 @@ out_cancel:
 | 
					 | 
				
			||||||
 	host_ui->xattr_size += CALC_DENT_SIZE(fname_len(nm));
 | 
					 | 
				
			||||||
 	host_ui->xattr_size += CALC_XATTR_BYTES(ui->data_len);
 | 
					 | 
				
			||||||
 	host_ui->xattr_names += fname_len(nm);
 | 
					 | 
				
			||||||
-out_noent:
 | 
					 | 
				
			||||||
 	mutex_unlock(&host_ui->ui_mutex);
 | 
					 | 
				
			||||||
 	ubifs_release_budget(c, &req);
 | 
					 | 
				
			||||||
 	make_bad_inode(inode);
 | 
					 | 
				
			||||||
@@ -562,9 +541,6 @@ static int ubifs_xattr_remove(struct ino
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
 	ubifs_assert(inode_is_locked(host));
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
-	if (!host->i_nlink)
 | 
					 | 
				
			||||||
-		return -ENOENT;
 | 
					 | 
				
			||||||
-
 | 
					 | 
				
			||||||
 	if (fname_len(&nm) > UBIFS_MAX_NLEN)
 | 
					 | 
				
			||||||
 		return -ENAMETOOLONG;
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
@@ -73,7 +73,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 | 
				
			|||||||
 #include <linux/nsproxy.h>
 | 
					 #include <linux/nsproxy.h>
 | 
				
			||||||
 #include <net/net_namespace.h>
 | 
					 #include <net/net_namespace.h>
 | 
				
			||||||
 #include <net/netns/generic.h>
 | 
					 #include <net/netns/generic.h>
 | 
				
			||||||
@@ -974,8 +979,36 @@ static int pppoe_xmit(struct ppp_channel
 | 
					@@ -977,8 +982,36 @@ static int pppoe_xmit(struct ppp_channel
 | 
				
			||||||
 	return __pppoe_xmit(sk, skb);
 | 
					 	return __pppoe_xmit(sk, skb);
 | 
				
			||||||
 }
 | 
					 }
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -126,7 +126,7 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 | 
				
			|||||||
 static int advk_pcie_probe(struct platform_device *pdev)
 | 
					 static int advk_pcie_probe(struct platform_device *pdev)
 | 
				
			||||||
 {
 | 
					 {
 | 
				
			||||||
 	struct device *dev = &pdev->dev;
 | 
					 	struct device *dev = &pdev->dev;
 | 
				
			||||||
@@ -959,6 +1014,9 @@ static int advk_pcie_probe(struct platfo
 | 
					@@ -960,6 +1015,9 @@ static int advk_pcie_probe(struct platfo
 | 
				
			||||||
 	list_for_each_entry(child, &bus->children, node)
 | 
					 	list_for_each_entry(child, &bus->children, node)
 | 
				
			||||||
 		pcie_bus_configure_settings(child);
 | 
					 		pcie_bus_configure_settings(child);
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user