From: Greg Kroah-Hartman Date: Thu, 20 Jun 2019 16:50:08 +0000 (+0200) Subject: 4.19-stable patches X-Git-Tag: v5.1.13~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e930a6f40b994b3c0ec49dc34d4bbfee4552c382;p=thirdparty%2Fkernel%2Fstable-queue.git 4.19-stable patches added patches: abort-file_remove_privs-for-non-reg.-files.patch --- diff --git a/queue-4.19/abort-file_remove_privs-for-non-reg.-files.patch b/queue-4.19/abort-file_remove_privs-for-non-reg.-files.patch new file mode 100644 index 00000000000..3bf30065160 --- /dev/null +++ b/queue-4.19/abort-file_remove_privs-for-non-reg.-files.patch @@ -0,0 +1,51 @@ +From f69e749a49353d96af1a293f56b5b56de59c668a Mon Sep 17 00:00:00 2001 +From: Alexander Lochmann +Date: Fri, 14 Dec 2018 11:55:52 +0100 +Subject: Abort file_remove_privs() for non-reg. files + +From: Alexander Lochmann + +commit f69e749a49353d96af1a293f56b5b56de59c668a upstream. + +file_remove_privs() might be called for non-regular files, e.g. +blkdev inode. There is no reason to do its job on things +like blkdev inodes, pipes, or cdevs. Hence, abort if +file does not refer to a regular inode. + +AV: more to the point, for devices there might be any number of +inodes refering to given device. Which one to strip the permissions +from, even if that made any sense in the first place? All of them +will be observed with contents modified, after all. + +Found by LockDoc (Alexander Lochmann, Horst Schirmeier and Olaf +Spinczyk) + +Reviewed-by: Jan Kara +Signed-off-by: Alexander Lochmann +Signed-off-by: Horst Schirmeier +Signed-off-by: Al Viro +Cc: Zubin Mithra +Signed-off-by: Greg Kroah-Hartman + +--- + fs/inode.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +--- a/fs/inode.c ++++ b/fs/inode.c +@@ -1817,8 +1817,13 @@ int file_remove_privs(struct file *file) + int kill; + int error = 0; + +- /* Fast path for nothing security related */ +- if (IS_NOSEC(inode)) ++ /* ++ * Fast path for nothing security related. ++ * As well for non-regular files, e.g. blkdev inodes. ++ * For example, blkdev_write_iter() might get here ++ * trying to remove privs which it is not allowed to. ++ */ ++ if (IS_NOSEC(inode) || !S_ISREG(inode->i_mode)) + return 0; + + kill = dentry_needs_remove_privs(dentry); diff --git a/queue-4.19/net-phylink-set-the-autoneg-state-in-phylink_phy_change.patch b/queue-4.19/net-phylink-set-the-autoneg-state-in-phylink_phy_change.patch deleted file mode 100644 index 75c95316d8e..00000000000 --- a/queue-4.19/net-phylink-set-the-autoneg-state-in-phylink_phy_change.patch +++ /dev/null @@ -1,32 +0,0 @@ -From foo@baz Wed 19 Jun 2019 02:34:37 PM CEST -From: Ioana Ciornei -Date: Thu, 13 Jun 2019 09:37:51 +0300 -Subject: net: phylink: set the autoneg state in phylink_phy_change - -From: Ioana Ciornei - -[ Upstream commit ef7bfa84725d891bbdb88707ed55b2cbf94942bb ] - -The phy_state field of phylink should carry only valid information -especially when this can be passed to the .mac_config callback. -Update the an_enabled field with the autoneg state in the -phylink_phy_change function. - -Fixes: 9525ae83959b ("phylink: add phylink infrastructure") -Signed-off-by: Ioana Ciornei -Signed-off-by: David S. Miller -Signed-off-by: Greg Kroah-Hartman ---- - drivers/net/phy/phylink.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/net/phy/phylink.c -+++ b/drivers/net/phy/phylink.c -@@ -662,6 +662,7 @@ static void phylink_phy_change(struct ph - pl->phy_state.pause |= MLO_PAUSE_ASYM; - pl->phy_state.interface = phydev->interface; - pl->phy_state.link = up; -+ pl->phy_state.an_enabled = phydev->autoneg; - mutex_unlock(&pl->state_mutex); - - phylink_run_resolve(pl); diff --git a/queue-4.19/series b/queue-4.19/series index 038e2924dff..fcc59793db4 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -6,7 +6,6 @@ lapb-fixed-leak-of-control-blocks.patch neigh-fix-use-after-free-read-in-pneigh_get_next.patch net-dsa-rtl8366-fix-up-vlan-filtering.patch net-openvswitch-do-not-free-vport-if-register_netdevice-is-failed.patch -net-phylink-set-the-autoneg-state-in-phylink_phy_change.patch nfc-ensure-presence-of-required-attributes-in-the-deactivate_target-handler.patch sctp-free-cookie-before-we-memdup-a-new-one.patch sunhv-fix-device-naming-inconsistency-between-sunhv_console-and-sunhv_reg.patch @@ -59,3 +58,4 @@ scsi-libsas-delete-sas-port-if-expander-discover-fai.patch mlxsw-spectrum-prevent-force-of-56g.patch ocfs2-fix-error-path-kobject-memory-leak.patch coredump-fix-race-condition-between-collapse_huge_page-and-core-dumping.patch +abort-file_remove_privs-for-non-reg.-files.patch