January 2024 - Linux-stable-mirror

[PATCH net v3 1/2] rtnetlink: allow to set iface down before enslaving it

by Nicolas Dichtel

The below commit adds support for: > ip link set dummy0 down > ip link set dummy0 master bond0 up but breaks the opposite: > ip link set dummy0 up > ip link set dummy0 master bond0 down Let's add a workaround to have both commands working. Cc: stable(a)vger.kernel.org Fixes: a4abfa627c38 ("net: rtnetlink: Enslave device before bringing it up") Signed-off-by: Nicolas Dichtel <nicolas.dichtel(a)6wind.com> Acked-by: Phil Sutter <phil(a)nwl.cc> Reviewed-by: David Ahern <dsahern(a)kernel.org> --- net/core/rtnetlink.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index e8431c6c8490..dd79693c2d91 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -2905,6 +2905,14 @@ static int do_setlink(const struct sk_buff *skb, call_netdevice_notifiers(NETDEV_CHANGEADDR, dev); } + /* Backward compat: enable to set interface down before enslaving it */ + if (!(ifm->ifi_flags & IFF_UP) && ifm->ifi_change & IFF_UP) { + err = dev_change_flags(dev, rtnl_dev_combine_flags(dev, ifm), + extack); + if (err < 0) + goto errout; + } + if (tb[IFLA_MASTER]) { err = do_set_master(dev, nla_get_u32(tb[IFLA_MASTER]), extack); if (err) -- 2.39.2

1 year, 1 month

3
4
0 0

[PATCH V2 2/3] wifi: brcmfmac: avoid invalid list operation when vendor attach fails

by Arend van Spriel

When the brcmf_fwvid_attach() fails the driver instance is not added to the vendor list. Hence we should not try to delete it from that list when the brcmf_fwvid_detach() function is called in cleanup path. Cc: stable(a)vger.kernel.org # 6.2.x Fixes: d6a5c562214f ("wifi: brcmfmac: add support for vendor-specific firmware api") Signed-off-by: Arend van Spriel <arend.vanspriel(a)broadcom.com> --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.c index f633e2bbd891..b427782554b5 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.c @@ -186,9 +186,10 @@ void brcmf_fwvid_detach(struct brcmf_pub *drvr) mutex_lock(&fwvid_list_lock); - drvr->vops = NULL; - list_del(&drvr->bus_if->list); - + if (drvr->vops) { + drvr->vops = NULL; + list_del(&drvr->bus_if->list); + } mutex_unlock(&fwvid_list_lock); } -- 2.32.0

1 year, 1 month

1
0
0 0

[PATCH 1/3] wifi: brcmfmac: Demote vendor-specific attach/detach messages to info

by Arend van Spriel

From: Hector Martin <marcan(a)marcan.st> People are getting spooked by brcmfmac errors on their boot console. There's no reason for these messages to be errors. Cc: stable(a)vger.kernel.org # 6.2.x Fixes: d6a5c562214f ("wifi: brcmfmac: add support for vendor-specific firmware api") Signed-off-by: Hector Martin <marcan(a)marcan.st> [arend.vanspriel(a)broadcom.com: remove attach/detach vendor callbacks] Signed-off-by: Arend van Spriel <arend.vanspriel(a)broadcom.com> --- .../broadcom/brcm80211/brcmfmac/bca/core.c | 13 ---------- .../broadcom/brcm80211/brcmfmac/cyw/core.c | 13 ---------- .../broadcom/brcm80211/brcmfmac/fwvid.c | 7 +++-- .../broadcom/brcm80211/brcmfmac/fwvid.h | 26 ++----------------- .../broadcom/brcm80211/brcmfmac/wcc/core.c | 15 +---------- 5 files changed, 6 insertions(+), 68 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/core.c index a5d9ac5e6763..a963c242975a 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/core.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/core.c @@ -11,17 +11,6 @@ #include "vops.h" -static int brcmf_bca_attach(struct brcmf_pub *drvr) -{ - pr_err("%s: executing\n", __func__); - return 0; -} - -static void brcmf_bca_detach(struct brcmf_pub *drvr) -{ - pr_err("%s: executing\n", __func__); -} - static void brcmf_bca_feat_attach(struct brcmf_if *ifp) { /* SAE support not confirmed so disabling for now */ @@ -29,7 +18,5 @@ static void brcmf_bca_feat_attach(struct brcmf_if *ifp) } const struct brcmf_fwvid_ops brcmf_bca_ops = { - .attach = brcmf_bca_attach, - .detach = brcmf_bca_detach, .feat_attach = brcmf_bca_feat_attach, }; diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/core.c index 24670497f1a4..bec5748310b9 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/core.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/core.c @@ -11,17 +11,6 @@ #include "vops.h" -static int brcmf_cyw_attach(struct brcmf_pub *drvr) -{ - pr_err("%s: executing\n", __func__); - return 0; -} - -static void brcmf_cyw_detach(struct brcmf_pub *drvr) -{ - pr_err("%s: executing\n", __func__); -} - static int brcmf_cyw_set_sae_pwd(struct brcmf_if *ifp, struct cfg80211_crypto_settings *crypto) { @@ -49,7 +38,5 @@ static int brcmf_cyw_set_sae_pwd(struct brcmf_if *ifp, } const struct brcmf_fwvid_ops brcmf_cyw_ops = { - .attach = brcmf_cyw_attach, - .detach = brcmf_cyw_detach, .set_sae_password = brcmf_cyw_set_sae_pwd, }; diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.c index 86eafdb40541..f633e2bbd891 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.c @@ -89,8 +89,7 @@ int brcmf_fwvid_register_vendor(enum brcmf_fwvendor fwvid, struct module *vmod, if (fwvid >= BRCMF_FWVENDOR_NUM) return -ERANGE; - if (WARN_ON(!vmod) || WARN_ON(!vops) || - WARN_ON(!vops->attach) || WARN_ON(!vops->detach)) + if (WARN_ON(!vmod) || WARN_ON(!vops)) return -EINVAL; if (WARN_ON(fwvid_list[fwvid].vmod)) @@ -150,7 +149,7 @@ static inline int brcmf_fwvid_request_module(enum brcmf_fwvendor fwvid) } #endif -int brcmf_fwvid_attach_ops(struct brcmf_pub *drvr) +int brcmf_fwvid_attach(struct brcmf_pub *drvr) { enum brcmf_fwvendor fwvid = drvr->bus_if->fwvid; int ret; @@ -175,7 +174,7 @@ int brcmf_fwvid_attach_ops(struct brcmf_pub *drvr) return ret; } -void brcmf_fwvid_detach_ops(struct brcmf_pub *drvr) +void brcmf_fwvid_detach(struct brcmf_pub *drvr) { enum brcmf_fwvendor fwvid = drvr->bus_if->fwvid; diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.h index d9fc76b46db9..dac22534d033 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.h +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.h @@ -12,8 +12,6 @@ struct brcmf_pub; struct brcmf_if; struct brcmf_fwvid_ops { - int (*attach)(struct brcmf_pub *drvr); - void (*detach)(struct brcmf_pub *drvr); void (*feat_attach)(struct brcmf_if *ifp); int (*set_sae_password)(struct brcmf_if *ifp, struct cfg80211_crypto_settings *crypto); }; @@ -24,30 +22,10 @@ int brcmf_fwvid_register_vendor(enum brcmf_fwvendor fwvid, struct module *mod, int brcmf_fwvid_unregister_vendor(enum brcmf_fwvendor fwvid, struct module *mod); /* core driver functions */ -int brcmf_fwvid_attach_ops(struct brcmf_pub *drvr); -void brcmf_fwvid_detach_ops(struct brcmf_pub *drvr); +int brcmf_fwvid_attach(struct brcmf_pub *drvr); +void brcmf_fwvid_detach(struct brcmf_pub *drvr); const char *brcmf_fwvid_vendor_name(struct brcmf_pub *drvr); -static inline int brcmf_fwvid_attach(struct brcmf_pub *drvr) -{ - int ret; - - ret = brcmf_fwvid_attach_ops(drvr); - if (ret) - return ret; - - return drvr->vops->attach(drvr); -} - -static inline void brcmf_fwvid_detach(struct brcmf_pub *drvr) -{ - if (!drvr->vops) - return; - - drvr->vops->detach(drvr); - brcmf_fwvid_detach_ops(drvr); -} - static inline void brcmf_fwvid_feat_attach(struct brcmf_if *ifp) { const struct brcmf_fwvid_ops *vops = ifp->drvr->vops; diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/core.c index 2d8f80bd7382..fd593b93ad40 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/core.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/core.c @@ -7,21 +7,10 @@ #include <core.h> #include <bus.h> #include <fwvid.h> -#include <fwil.h> +#include <cfg80211.h> #include "vops.h" -static int brcmf_wcc_attach(struct brcmf_pub *drvr) -{ - pr_debug("%s: executing\n", __func__); - return 0; -} - -static void brcmf_wcc_detach(struct brcmf_pub *drvr) -{ - pr_debug("%s: executing\n", __func__); -} - static int brcmf_wcc_set_sae_pwd(struct brcmf_if *ifp, struct cfg80211_crypto_settings *crypto) { @@ -30,7 +19,5 @@ static int brcmf_wcc_set_sae_pwd(struct brcmf_if *ifp, } const struct brcmf_fwvid_ops brcmf_wcc_ops = { - .attach = brcmf_wcc_attach, - .detach = brcmf_wcc_detach, .set_sae_password = brcmf_wcc_set_sae_pwd, }; -- 2.32.0

1 year, 1 month

1
1
0 0

[PATCH 4.14 00/21] 4.14.335-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.14.335 release. There are 21 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Sun, 07 Jan 2024 14:38:02 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.14.335-r… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.14.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 4.14.335-rc1 Sarthak Kukreti <sarthakkukreti(a)chromium.org> block: Don't invalidate pagecache for invalid falloc modes Mikulas Patocka <mpatocka(a)redhat.com> dm-integrity: don't modify bio's immutable bio_vec in integrity_metadata() Rouven Czerwinski <r.czerwinski(a)pengutronix.de> net: rfkill: gpio: set GPIO direction Fedor Pchelkin <pchelkin(a)ispras.ru> net: 9p: avoid freeing uninit memory in p9pdu_vreadf Luiz Augusto von Dentz <luiz.von.dentz(a)intel.com> Bluetooth: hci_event: Fix not checking if HCI_OP_INQUIRY has been sent Reinhard Speyerer <rspmn(a)arcor.de> USB: serial: option: add Quectel RM500Q R13 firmware support Slark Xiao <slark_xiao(a)163.com> USB: serial: option: add Foxconn T99W265 with new baseline Alper Ak <alperyasinak1(a)gmail.com> USB: serial: option: add Quectel EG912Y module support Mark Glover <mark.glover(a)actisense.com> USB: serial: ftdi_sio: update Actisense PIDs constant names Johannes Berg <johannes.berg(a)intel.com> wifi: cfg80211: fix certs build to not depend on file order Chen-Yu Tsai <wens(a)kernel.org> wifi: cfg80211: Add my certificate Javier Carrasco <javier.carrasco.cruz(a)gmail.com> iio: common: ms_sensors: ms_sensors_i2c: fix humidity conversion time table Haoran Liu <liuhaoran14(a)163.com> Input: ipaq-micro-keys - add error handling for devm_kmemdup Su Hui <suhui(a)nfschina.com> iio: imu: inv_mpu6050: fix an error code problem in inv_mpu6050_read_raw Alexis Lothoré <alexis.lothore(a)bootlin.com> pinctrl: at91-pio4: use dedicated lock class for IRQ Liu Jian <liujian56(a)huawei.com> net: check vlan filter feature in vlan_vids_add_by_dev() and vlan_vids_del_by_dev() Zhipeng Lu <alexious(a)zju.edu.cn> ethernet: atheros: fix a memleak in atl1e_setup_ring_resources Eric Dumazet <edumazet(a)google.com> net: sched: ife: fix potential use-after-free Johannes Berg <johannes.berg(a)intel.com> wifi: mac80211: mesh_plink: fix matches_local logic Heiko Carstens <hca(a)linux.ibm.com> s390/vx: fix save/restore of fpu kernel context Kunwu Chan <chentao(a)kylinos.cn> ARM: OMAP2+: Fix null pointer dereference and memory leak in omap_soc_device_init ------------- Diffstat: Makefile | 4 +- arch/arm/mach-omap2/id.c | 5 ++ arch/s390/include/asm/fpu/api.h | 2 +- drivers/iio/common/ms_sensors/ms_sensors_i2c.c | 4 +- drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 4 +- drivers/input/keyboard/ipaq-micro-keys.c | 3 + drivers/md/dm-integrity.c | 11 ++-- drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 5 +- drivers/pinctrl/pinctrl-at91-pio4.c | 8 +++ drivers/usb/serial/ftdi_sio.c | 6 +- drivers/usb/serial/ftdi_sio_ids.h | 6 +- drivers/usb/serial/option.c | 5 ++ fs/block_dev.c | 9 ++- net/8021q/vlan_core.c | 9 ++- net/9p/protocol.c | 17 +++-- net/bluetooth/hci_event.c | 3 +- net/ife/ife.c | 1 + net/mac80211/mesh_plink.c | 10 +-- net/rfkill/rfkill-gpio.c | 8 +++ net/wireless/certs/wens.hex | 87 +++++++++++++++++++++++++ 20 files changed, 175 insertions(+), 32 deletions(-)

1 year, 1 month

6
28
0 0

[PATCH 5.4 00/47] 5.4.266-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.4.266 release. There are 47 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Sun, 07 Jan 2024 14:38:02 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.266-rc… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.4.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 5.4.266-rc1 Sarthak Kukreti <sarthakkukreti(a)chromium.org> block: Don't invalidate pagecache for invalid falloc modes Steven Rostedt (Google) <rostedt(a)goodmis.org> ring-buffer: Fix wake ups when buffer_percent is set to 100 Tony Lindgren <tony(a)atomide.com> bus: ti-sysc: Flush posted write only after srst_udelay Julien Panis <jpanis(a)baylibre.com> bus: ti-sysc: Use fsleep() instead of usleep_range() in sysc_reset() Paulo Alcantara <pc(a)manguebit.com> smb: client: fix OOB in smbCalcSize() Dan Carpenter <dan.carpenter(a)linaro.org> usb: fotg210-hcd: delete an incorrect bounds test Thomas Gleixner <tglx(a)linutronix.de> x86/alternatives: Sync core before enabling interrupts Rouven Czerwinski <r.czerwinski(a)pengutronix.de> net: rfkill: gpio: set GPIO direction Fedor Pchelkin <pchelkin(a)ispras.ru> net: 9p: avoid freeing uninit memory in p9pdu_vreadf Luiz Augusto von Dentz <luiz.von.dentz(a)intel.com> Bluetooth: hci_event: Fix not checking if HCI_OP_INQUIRY has been sent Reinhard Speyerer <rspmn(a)arcor.de> USB: serial: option: add Quectel RM500Q R13 firmware support Slark Xiao <slark_xiao(a)163.com> USB: serial: option: add Foxconn T99W265 with new baseline Alper Ak <alperyasinak1(a)gmail.com> USB: serial: option: add Quectel EG912Y module support Mark Glover <mark.glover(a)actisense.com> USB: serial: ftdi_sio: update Actisense PIDs constant names Johannes Berg <johannes.berg(a)intel.com> wifi: cfg80211: fix certs build to not depend on file order Chen-Yu Tsai <wens(a)kernel.org> wifi: cfg80211: Add my certificate Wadim Egorov <w.egorov(a)phytec.de> iio: adc: ti_am335x_adc: Fix return value check of tiadc_request_dma() Javier Carrasco <javier.carrasco.cruz(a)gmail.com> iio: common: ms_sensors: ms_sensors_i2c: fix humidity conversion time table Wei Yongjun <weiyongjun1(a)huawei.com> scsi: bnx2fc: Fix skb double free in bnx2fc_rcv() Haoran Liu <liuhaoran14(a)163.com> Input: ipaq-micro-keys - add error handling for devm_kmemdup Su Hui <suhui(a)nfschina.com> iio: imu: inv_mpu6050: fix an error code problem in inv_mpu6050_read_raw Mike Tipton <quic_mdtipton(a)quicinc.com> interconnect: Treat xlate() returning NULL node as an error Josef Bacik <josef(a)toxicpanda.com> btrfs: do not allow non subvolume root targets for snapshot Paulo Alcantara <pc(a)manguebit.com> smb: client: fix NULL deref in asn1_ber_decoder() Kai Vehmanen <kai.vehmanen(a)linux.intel.com> ALSA: hda/hdmi: add force-connect quirk for NUC5CPYB Kai Vehmanen <kai.vehmanen(a)linux.intel.com> ALSA: hda/hdmi: Add quirk to force pin connectivity on NUC10 Alexis Lothoré <alexis.lothore(a)bootlin.com> pinctrl: at91-pio4: use dedicated lock class for IRQ Quan Nguyen <quan(a)os.amperecomputing.com> i2c: aspeed: Handle the coalesced stop conditions with the start conditions. David Howells <dhowells(a)redhat.com> afs: Fix overwriting of result of DNS query Eric Dumazet <edumazet(a)google.com> net: check dev->gso_max_size in gso_features_check() Heiner Kallweit <hkallweit1(a)gmail.com> net: warn if gso_type isn't set for a GSO SKB David Howells <dhowells(a)redhat.com> afs: Fix dynamic root lookup DNS check David Howells <dhowells(a)redhat.com> afs: Fix the dynamic root's d_delete to always delete unused dentries Liu Jian <liujian56(a)huawei.com> net: check vlan filter feature in vlan_vids_add_by_dev() and vlan_vids_del_by_dev() Eric Dumazet <edumazet(a)google.com> net/rose: fix races in rose_kill_by_device() Zhipeng Lu <alexious(a)zju.edu.cn> ethernet: atheros: fix a memleak in atl1e_setup_ring_resources Eric Dumazet <edumazet(a)google.com> net: sched: ife: fix potential use-after-free Rahul Rameshbabu <rrameshbabu(a)nvidia.com> net/mlx5e: Correct snprintf truncation handling for fw_version buffer used by representors Moshe Shemesh <moshe(a)nvidia.com> net/mlx5: Fix fw tracer first block check Hu Haowen <xianfengting221(a)163.com> net/mlx5: improve some comments Vlad Buslov <vladbu(a)nvidia.com> Revert "net/mlx5e: fix double free of encap_header" Johannes Berg <johannes.berg(a)intel.com> wifi: mac80211: mesh_plink: fix matches_local logic Heiko Carstens <hca(a)linux.ibm.com> s390/vx: fix save/restore of fpu kernel context Geert Uytterhoeven <geert+renesas(a)glider.be> reset: Fix crash when freeing non-existent optional resets Kunwu Chan <chentao(a)kylinos.cn> ARM: OMAP2+: Fix null pointer dereference and memory leak in omap_soc_device_init Namjae Jeon <linkinjeon(a)kernel.org> ksmbd: fix wrong name of SMB2_CREATE_ALLOCATION_SIZE Bin Li <bin.li(a)canonical.com> ALSA: hda/realtek: Enable headset on Lenovo M90 Gen5 ------------- Diffstat: Makefile | 4 +- arch/arm/mach-omap2/id.c | 5 ++ arch/s390/include/asm/fpu/api.h | 2 +- arch/x86/kernel/alternative.c | 2 +- drivers/bus/ti-sysc.c | 19 +++-- drivers/i2c/busses/i2c-aspeed.c | 48 ++++++++---- drivers/iio/adc/ti_am335x_adc.c | 4 +- drivers/iio/common/ms_sensors/ms_sensors_i2c.c | 4 +- drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 4 +- drivers/input/keyboard/ipaq-micro-keys.c | 3 + drivers/interconnect/core.c | 3 + drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 5 +- .../ethernet/mellanox/mlx5/core/diag/fw_tracer.c | 4 +- .../net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 10 ++- drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 2 +- drivers/pinctrl/pinctrl-at91-pio4.c | 8 ++ drivers/reset/core.c | 3 + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 9 +-- drivers/usb/host/fotg210-hcd.c | 3 - drivers/usb/serial/ftdi_sio.c | 6 +- drivers/usb/serial/ftdi_sio_ids.h | 6 +- drivers/usb/serial/option.c | 5 ++ fs/afs/cell.c | 6 +- fs/afs/dynroot.c | 31 ++++---- fs/block_dev.c | 9 ++- fs/btrfs/ioctl.c | 9 +++ fs/cifs/misc.c | 4 + fs/cifs/smb2misc.c | 26 +++---- fs/cifs/smb2pdu.h | 2 +- kernel/trace/ring_buffer.c | 9 ++- net/8021q/vlan_core.c | 9 ++- net/9p/protocol.c | 17 ++++- net/bluetooth/hci_event.c | 3 +- net/core/dev.c | 8 ++ net/ife/ife.c | 1 + net/mac80211/mesh_plink.c | 10 +-- net/rfkill/rfkill-gpio.c | 8 ++ net/rose/af_rose.c | 41 ++++++++-- net/wireless/certs/wens.hex | 87 ++++++++++++++++++++++ sound/pci/hda/patch_hdmi.c | 2 + sound/pci/hda/patch_realtek.c | 1 + 41 files changed, 335 insertions(+), 107 deletions(-)

1 year, 1 month

4
53
0 0

Linux 6.6.10

by Greg Kroah-Hartman

I'm announcing the release of the 6.6.10 kernel. All users of the 6.6 kernel series must upgrade. The updated 6.6.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-6.6.y and can be browsed at the normal kernel.org git web browser: https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Makefile | 2 arch/powerpc/Kconfig | 4 arch/riscv/Kconfig | 4 arch/s390/Kconfig | 4 arch/x86/Kconfig | 4 drivers/nvme/host/fc.c | 21 --- drivers/platform/x86/intel/pmc/adl.c | 9 - drivers/platform/x86/intel/pmc/cnp.c | 26 +++- drivers/platform/x86/intel/pmc/core.c | 12 + drivers/platform/x86/intel/pmc/core.h | 7 - drivers/platform/x86/intel/pmc/mtl.c | 9 - drivers/platform/x86/intel/pmc/tgl.c | 9 - drivers/virtio/virtio_ring.c | 6 fs/libfs.c | 41 ++++-- fs/smb/client/file.c | 18 +- fs/smb/client/fscache.h | 6 fs/smb/client/inode.c | 17 +- fs/smb/client/smb2ops.c | 6 fs/smb/common/smb2pdu.h | 1 fs/smb/server/connection.c | 16 -- fs/smb/server/ksmbd_work.c | 51 ++++---- fs/smb/server/mgmt/user_config.h | 1 fs/smb/server/oplock.c | 118 ++++++++++++++++-- fs/smb/server/oplock.h | 8 + fs/smb/server/smb2misc.c | 15 +- fs/smb/server/smb2ops.c | 9 - fs/smb/server/smb2pdu.c | 156 +++++++++++++------------ fs/smb/server/transport_rdma.c | 40 ++++-- fs/smb/server/unicode.c | 187 ++++++++++++++++++++++-------- fs/smb/server/vfs.c | 14 +- fs/smb/server/vfs_cache.c | 30 ++-- fs/smb/server/vfs_cache.h | 9 - include/linux/blkdev.h | 2 include/linux/export-internal.h | 6 include/linux/fs.h | 85 +++++++++++-- kernel/Kconfig.kexec | 2 kernel/trace/ftrace.c | 100 +++++++--------- kernel/trace/ring_buffer.c | 12 + kernel/trace/trace.c | 20 ++- lib/maple_tree.c | 11 + mm/filemap.c | 9 + mm/memory-failure.c | 8 - mm/migrate.c | 9 + net/mptcp/protocol.c | 27 +++- net/mptcp/protocol.h | 63 ++++++++-- net/mptcp/sockopt.c | 5 net/mptcp/subflow.c | 29 ++-- net/netfilter/nf_tables_api.c | 2 net/wireless/core.h | 1 net/wireless/nl80211.c | 56 +++++--- tools/testing/radix-tree/maple.c | 2 tools/testing/selftests/mm/memfd_secret.c | 3 52 files changed, 884 insertions(+), 428 deletions(-) Arnd Bergmann (2): kexec: fix KEXEC_FILE dependencies kexec: select CRYPTO from KEXEC_FILE instead of depending on it Baokun Li (1): mm/filemap: avoid buffered read/write race to read inconsistent data Charan Teja Kalla (1): mm: migrate high-order folios in swap cache correctly Cheng-Han Wu (1): ksmbd: Remove unused field in ksmbd_user struct Christoph Hellwig (1): block: renumber QUEUE_FLAG_HW_WC David E. Box (3): platform/x86/intel/pmc: Add suspend callback platform/x86/intel/pmc: Allow reenabling LTRs platform/x86/intel/pmc: Move GBE LTR ignore to suspend callback Greg Kroah-Hartman (1): Linux 6.6.10 Helge Deller (2): linux/export: Fix alignment for 64-bit ksymtab entries linux/export: Ensure natural alignment of kcrctab array Jeff Layton (2): fs: new accessor methods for atime and mtime client: convert to new timestamp accessors Johannes Berg (1): wifi: cfg80211: fix CQM for non-range use Kangjing Huang (1): ksmbd: fix missing RDMA-capable flag for IPoIB device in ksmbd_rdma_capable_netdev() Keith Busch (1): Revert "nvme-fc: fix race between error recovery and creating association" Léo Lam (1): wifi: nl80211: fix deadlock in nl80211_set_cqm_rssi (6.6.x) Matthew Wilcox (Oracle) (2): mm/memory-failure: cast index to loff_t before shifting it mm/memory-failure: check the mapcount of the precise page Muhammad Usama Anjum (1): selftests: secretmem: floor the memory size to the multiple of page_size Namjae Jeon (17): ksmbd: reorganize ksmbd_iov_pin_rsp() ksmbd: fix kernel-doc comment of ksmbd_vfs_setxattr() ksmbd: add support for surrogate pair conversion ksmbd: no need to wait for binded connection termination at logoff ksmbd: fix kernel-doc comment of ksmbd_vfs_kern_path_locked() ksmbd: separately allocate ci per dentry ksmbd: move oplock handling after unlock parent dir ksmbd: release interim response after sending status pending response ksmbd: move setting SMB2_FLAGS_ASYNC_COMMAND and AsyncId ksmbd: don't update ->op_state as OPLOCK_STATE_NONE on error ksmbd: set epoch in create context v2 lease ksmbd: set v2 lease capability ksmbd: downgrade RWH lease caching state to RH for directory ksmbd: send v2 lease break notification for directory ksmbd: lazy v2 lease break on smb2_write() ksmbd: avoid duplicate opinfo_put() call on error of smb21_lease_break_ack() ksmbd: fix slab-out-of-bounds in smb_strndup_from_utf16() Pablo Neira Ayuso (1): netfilter: nf_tables: skip set commit for deleted/destroyed sets Paolo Abeni (3): mptcp: refactor sndbuf auto-tuning mptcp: fix possible NULL pointer dereference on close mptcp: fix inconsistent state on fastopen race Shin'ichiro Kawasaki (2): platform/x86: p2sb: Allow p2sb_bar() calls during PCI device probe Revert "platform/x86: p2sb: Allow p2sb_bar() calls during PCI device probe" Sidhartha Kumar (1): maple_tree: do not preallocate nodes for slot stores Steven Rostedt (Google) (3): ring-buffer: Fix wake ups when buffer_percent is set to 100 ftrace: Fix modification of direct_function hash while in use tracing: Fix blocked reader of snapshot buffer Xuan Zhuo (1): virtio_ring: fix syncs DMA memory with different direction Zizhi Wo (1): fs: cifs: Fix atime update check Zongmin Zhou (1): ksmbd: prevent memory leak on error return

1 year, 1 month

1
1
0 0

Linux 6.1.71

by Greg Kroah-Hartman

I'm announcing the release of the 6.1.71 kernel. All users of the 6.1 kernel series must upgrade. The updated 6.1.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-6.1.y and can be browsed at the normal kernel.org git web browser: https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Makefile | 2 arch/arm/boot/dts/am33xx.dtsi | 1 drivers/base/property.c | 11 drivers/iio/imu/adis16475.c | 117 ++-- drivers/spi/spi-atmel.c | 82 ++- drivers/spi/spi.c | 92 ++- drivers/usb/host/fotg210-hcd.c | 3 fs/namei.c | 125 +++- fs/nfsd/nfsctl.c | 9 fs/nfsd/nfsd.h | 8 fs/nfsd/nfssvc.c | 57 -- fs/smb/common/smb2pdu.h | 1 fs/smb/server/Kconfig | 10 fs/smb/server/asn1.c | 27 fs/smb/server/auth.c | 11 fs/smb/server/connection.c | 74 -- fs/smb/server/connection.h | 2 fs/smb/server/ksmbd_netlink.h | 4 fs/smb/server/ksmbd_work.c | 100 +++ fs/smb/server/ksmbd_work.h | 36 - fs/smb/server/mgmt/share_config.h | 29 - fs/smb/server/mgmt/tree_connect.c | 53 + fs/smb/server/mgmt/tree_connect.h | 14 fs/smb/server/mgmt/user_config.h | 1 fs/smb/server/mgmt/user_session.c | 38 - fs/smb/server/mgmt/user_session.h | 3 fs/smb/server/oplock.c | 147 ++++- fs/smb/server/oplock.h | 8 fs/smb/server/server.c | 36 - fs/smb/server/smb2misc.c | 19 fs/smb/server/smb2ops.c | 19 fs/smb/server/smb2pdu.c | 1033 ++++++++++++++++---------------------- fs/smb/server/smb2pdu.h | 3 fs/smb/server/smb_common.c | 19 fs/smb/server/smb_common.h | 14 fs/smb/server/smbacl.c | 20 fs/smb/server/smbacl.h | 2 fs/smb/server/transport_ipc.c | 4 fs/smb/server/transport_rdma.c | 44 + fs/smb/server/unicode.c | 193 ++++--- fs/smb/server/vfs.c | 608 +++++++++++----------- fs/smb/server/vfs.h | 52 - fs/smb/server/vfs_cache.c | 63 +- fs/smb/server/vfs_cache.h | 18 include/linux/blkdev.h | 2 include/linux/export-internal.h | 1 include/linux/module.h | 9 include/linux/namei.h | 7 include/linux/property.h | 7 include/linux/spi/spi.h | 23 kernel/module/kallsyms.c | 2 kernel/trace/ring_buffer.c | 140 +---- kernel/trace/trace.c | 20 kernel/trace/trace_kprobe.c | 25 mm/filemap.c | 9 mm/memory-failure.c | 8 mm/migrate.c | 9 net/netfilter/nf_tables_api.c | 2 58 files changed, 1981 insertions(+), 1495 deletions(-) Al Viro (1): fs: introduce lock_rename_child() helper Amit Kumar Mahapatra (1): spi: Add APIs in spi core to set/get spi->chip_select and spi->cs_gpiod Andrii Nakryiko (1): tracing/kprobes: Fix symbol counting logic by looking at modules as well Andy Shevchenko (2): spi: Introduce spi_get_device_match_data() helper device property: Allow const parameter to dev_fwnode() Atte Heikkilä (1): ksmbd: fix `force create mode' and `force directory mode' Baokun Li (1): mm/filemap: avoid buffered read/write race to read inconsistent data Charan Teja Kalla (1): mm: migrate high-order folios in swap cache correctly Cheng-Han Wu (1): ksmbd: Remove unused field in ksmbd_user struct Christoph Hellwig (1): block: renumber QUEUE_FLAG_HW_WC Colin Ian King (1): ksmbd: Fix spelling mistake "excceed" -> "exceeded" Dan Carpenter (1): usb: fotg210-hcd: delete an incorrect bounds test David Disseldorp (3): ksmbd: set NegotiateContextCount once instead of every inc ksmbd: avoid duplicate negotiate ctx offset increments ksmbd: remove unused compression negotiate ctx packing Dawei Li (3): ksmbd: Implements sess->rpc_handle_list as xarray ksmbd: fix typo, syncronous->synchronous ksmbd: Remove duplicated codes Geert Uytterhoeven (1): spi: Constify spi parameters of chip select APIs Greg Kroah-Hartman (1): Linux 6.1.71 Gustavo A. R. Silva (3): ksmbd: replace one-element arrays with flexible-array members ksmbd: Use struct_size() helper in ksmbd_negotiate_smb_dialect() ksmbd: Replace one-element array with flexible-array member Helge Deller (1): linux/export: Ensure natural alignment of kcrctab array Jeff Layton (1): ksmbd: use F_SETLK when unlocking a file Jiapeng Chong (1): ksmbd: Fix parameter name and comment mismatch Jiri Olsa (1): kallsyms: Make module_kallsyms_on_each_symbol generally available Kangjing Huang (1): ksmbd: fix missing RDMA-capable flag for IPoIB device in ksmbd_rdma_capable_netdev() Louis Chauvet (1): spi: atmel: Fix clock issue when using devices with different polarities Lu Hongfei (2): ksmbd: Change the return value of ksmbd_vfs_query_maximal_access to void ksmbd: Replace the ternary conditional operator with min() Marios Makassikis (2): ksmbd: Fix resource leak in smb2_lock() ksmbd: fix recursive locking in vfs helpers Matthew Wilcox (Oracle) (2): mm/memory-failure: cast index to loff_t before shifting it mm/memory-failure: check the mapcount of the precise page Namjae Jeon (46): ksmbd: set SMB2_SESSION_FLAG_ENCRYPT_DATA when enforcing data encryption for this share ksmbd: delete asynchronous work from list ksmbd: fix racy issue from using ->d_parent and ->d_name ksmbd: fix uninitialized pointer read in ksmbd_vfs_rename() ksmbd: fix uninitialized pointer read in smb2_create_link() ksmbd: call putname after using the last component ksmbd: fix posix_acls and acls dereferencing possible ERR_PTR() ksmbd: add mnt_want_write to ksmbd vfs functions ksmbd: remove unused ksmbd_tree_conn_share function ksmbd: use kzalloc() instead of __GFP_ZERO ksmbd: return a literal instead of 'err' in ksmbd_vfs_kern_path_locked() ksmbd: use kvzalloc instead of kvmalloc ksmbd: check if a mount point is crossed during path lookup ksmbd: add support for read compound ksmbd: fix wrong interim response on compound ksmbd: add missing calling smb2_set_err_rsp() on error ksmbd: remove unneeded mark_inode_dirty in set_info_sec() ksmbd: fix passing freed memory 'aux_payload_buf' ksmbd: return invalid parameter error response if smb2 request is invalid ksmbd: check iov vector index in ksmbd_conn_write() ksmbd: fix race condition with fp ksmbd: fix race condition from parallel smb2 logoff requests ksmbd: fix race condition from parallel smb2 lock requests ksmbd: fix race condition between tree conn lookup and disconnect ksmbd: fix wrong error response status by using set_smb2_rsp_status() ksmbd: fix Null pointer dereferences in ksmbd_update_fstate() ksmbd: fix potential double free on smb2_read_pipe() error path ksmbd: reorganize ksmbd_iov_pin_rsp() ksmbd: fix kernel-doc comment of ksmbd_vfs_setxattr() ksmbd: add support for surrogate pair conversion ksmbd: no need to wait for binded connection termination at logoff ksmbd: fix kernel-doc comment of ksmbd_vfs_kern_path_locked() ksmbd: fix possible deadlock in smb2_open ksmbd: separately allocate ci per dentry ksmbd: move oplock handling after unlock parent dir ksmbd: release interim response after sending status pending response ksmbd: move setting SMB2_FLAGS_ASYNC_COMMAND and AsyncId ksmbd: don't update ->op_state as OPLOCK_STATE_NONE on error ksmbd: set epoch in create context v2 lease ksmbd: set v2 lease capability ksmbd: downgrade RWH lease caching state to RH for directory ksmbd: send v2 lease break notification for directory ksmbd: lazy v2 lease break on smb2_write() ksmbd: avoid duplicate opinfo_put() call on error of smb21_lease_break_ack() ksmbd: fix wrong allocation size update in smb2_open() ksmbd: fix slab-out-of-bounds in smb_strndup_from_utf16() NeilBrown (3): nfsd: separate nfsd_last_thread() from nfsd_put() nfsd: call nfsd_last_thread() before final nfsd_put() NFSD: fix possible oops when nfsd/pool_stats is closed. Nuno Sa (1): iio: imu: adis16475: add spi_device_id table Pablo Neira Ayuso (1): netfilter: nf_tables: skip set commit for deleted/destroyed sets Shin'ichiro Kawasaki (2): platform/x86: p2sb: Allow p2sb_bar() calls during PCI device probe Revert "platform/x86: p2sb: Allow p2sb_bar() calls during PCI device probe" Steve French (2): ksmbd: update Kconfig to note Kerberos support and fix indentation ksmbd: remove experimental warning Steven Rostedt (Google) (4): ring-buffer: Fix wake ups when buffer_percent is set to 100 tracing: Fix blocked reader of snapshot buffer ring-buffer: Remove useless update to write_stamp in rb_try_to_discard() ring-buffer: Fix slowpath of interrupted event Tom Rix (1): ksmbd: remove unused is_char_allowed function Tony Lindgren (1): ARM: dts: Fix occasional boot hang for am3 usb Tudor Ambarus (1): spi: Reintroduce spi_set_cs_timing() Wang Ming (1): ksmbd: Fix unsigned expression compared with zero Yang Li (1): ksmbd: Fix one kernel-doc comment Yang Yingliang (1): ksmbd: switch to use kmemdup_nul() helper Zongmin Zhou (1): ksmbd: prevent memory leak on error return ye xingchen (1): ksmbd: Convert to use sysfs_emit()/sysfs_emit_at() APIs

1 year, 1 month

1
1
0 0

Linux 5.15.146

by Greg Kroah-Hartman

I'm announcing the release of the 5.15.146 kernel. All users of the 5.15 kernel series must upgrade. The updated 5.15.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.15.y and can be browsed at the normal kernel.org git web browser: https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Documentation/devicetree/bindings/nvmem/mxs-ocotp.yaml | 10 Makefile | 2 arch/arm/boot/dts/am33xx.dtsi | 1 arch/arm/boot/dts/dra7.dtsi | 2 arch/arm/mach-omap2/id.c | 5 arch/arm64/kvm/arm.c | 2 arch/arm64/kvm/vgic/vgic-init.c | 5 arch/arm64/kvm/vgic/vgic-mmio-v3.c | 2 arch/arm64/kvm/vgic/vgic.h | 1 arch/s390/include/asm/fpu/api.h | 2 arch/x86/kernel/alternative.c | 2 arch/x86/net/bpf_jit_comp.c | 46 + drivers/base/property.c | 13 drivers/bus/ti-sysc.c | 18 drivers/gpio/gpio-dwapb.c | 12 drivers/gpio/gpiolib-cdev.c | 16 drivers/gpu/drm/i915/display/intel_atomic.c | 193 ------- drivers/gpu/drm/i915/display/intel_atomic.h | 4 drivers/gpu/drm/i915/display/skl_scaler.c | 257 ++++++++++ drivers/gpu/drm/i915/display/skl_scaler.h | 10 drivers/i2c/busses/i2c-aspeed.c | 48 + drivers/iio/adc/ti_am335x_adc.c | 4 drivers/iio/buffer/industrialio-triggered-buffer.c | 10 drivers/iio/common/ms_sensors/ms_sensors_i2c.c | 4 drivers/iio/imu/adis16475.c | 117 ++-- drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 4 drivers/input/keyboard/ipaq-micro-keys.c | 3 drivers/input/misc/soc_button_array.c | 5 drivers/interconnect/core.c | 3 drivers/md/dm-integrity.c | 11 drivers/net/ethernet/actions/owl-emac.c | 2 drivers/net/ethernet/adaptec/starfire.c | 10 drivers/net/ethernet/alacritech/slicoss.c | 2 drivers/net/ethernet/alteon/acenic.c | 4 drivers/net/ethernet/altera/altera_tse_main.c | 2 drivers/net/ethernet/amd/nmclan_cs.c | 3 drivers/net/ethernet/amd/xgbe/xgbe-dev.c | 2 drivers/net/ethernet/amd/xgbe/xgbe.h | 2 drivers/net/ethernet/apm/xgene-v2/mac.c | 2 drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 2 drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c | 2 drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c | 2 drivers/net/ethernet/apple/bmac.c | 8 drivers/net/ethernet/aquantia/atlantic/aq_hw.h | 6 drivers/net/ethernet/aquantia/atlantic/aq_macsec.c | 2 drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c | 4 drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 4 drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.h | 2 drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c | 4 drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c | 4 drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2.c | 2 drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 5 drivers/net/ethernet/broadcom/b44.c | 6 drivers/net/ethernet/broadcom/bcmsysport.c | 2 drivers/net/ethernet/broadcom/bgmac.c | 2 drivers/net/ethernet/broadcom/bnx2.c | 2 drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 2 drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 4 drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 3 drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | 2 drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 4 drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.h | 2 drivers/net/ethernet/broadcom/genet/bcmgenet.c | 4 drivers/net/ethernet/calxeda/xgmac.c | 2 drivers/net/ethernet/chelsio/cxgb/gmac.h | 2 drivers/net/ethernet/chelsio/cxgb/pm3393.c | 2 drivers/net/ethernet/chelsio/cxgb/vsc7326.c | 2 drivers/net/ethernet/chelsio/cxgb3/common.h | 2 drivers/net/ethernet/chelsio/cxgb3/xgmac.c | 2 drivers/net/ethernet/cisco/enic/enic_pp.c | 2 drivers/net/ethernet/dlink/dl2k.c | 2 drivers/net/ethernet/dnet.c | 6 drivers/net/ethernet/emulex/benet/be_cmds.c | 2 drivers/net/ethernet/emulex/benet/be_cmds.h | 2 drivers/net/ethernet/emulex/benet/be_main.c | 2 drivers/net/ethernet/ethoc.c | 2 drivers/net/ethernet/fealnx.c | 2 drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 4 drivers/net/ethernet/freescale/fman/fman_dtsec.c | 8 drivers/net/ethernet/freescale/fman/fman_dtsec.h | 2 drivers/net/ethernet/freescale/fman/fman_memac.c | 8 drivers/net/ethernet/freescale/fman/fman_memac.h | 2 drivers/net/ethernet/freescale/fman/fman_tgec.c | 8 drivers/net/ethernet/freescale/fman/fman_tgec.h | 2 drivers/net/ethernet/freescale/fman/mac.h | 2 drivers/net/ethernet/hisilicon/hisi_femac.c | 2 drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 2 drivers/net/ethernet/hisilicon/hns/hnae.h | 2 drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c | 2 drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c | 2 drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 2 drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h | 5 drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c | 2 drivers/net/ethernet/hisilicon/hns3/hnae3.h | 2 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 2 drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 2 drivers/net/ethernet/i825xx/sun3_82586.c | 2 drivers/net/ethernet/intel/i40e/i40e.h | 2 drivers/net/ethernet/intel/ixgb/ixgb_hw.c | 2 drivers/net/ethernet/intel/ixgb/ixgb_hw.h | 2 drivers/net/ethernet/marvell/mv643xx_eth.c | 2 drivers/net/ethernet/marvell/mvneta.c | 4 drivers/net/ethernet/marvell/pxa168_eth.c | 6 drivers/net/ethernet/mediatek/mtk_star_emac.c | 2 drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.c | 2 drivers/net/ethernet/mellanox/mlx5/core/en/fs_tt_redirect.c | 1 drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 30 - drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 4 drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 2 drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c | 2 drivers/net/ethernet/mellanox/mlx5/core/vport.c | 2 drivers/net/ethernet/micrel/ks8842.c | 2 drivers/net/ethernet/micrel/ks8851.h | 3 drivers/net/ethernet/micrel/ks8851_common.c | 20 drivers/net/ethernet/micrel/ks8851_spi.c | 42 + drivers/net/ethernet/micrel/ksz884x.c | 4 drivers/net/ethernet/microsoft/Kconfig | 1 drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 3 drivers/net/ethernet/neterion/s2io.c | 2 drivers/net/ethernet/neterion/s2io.h | 2 drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c | 6 drivers/net/ethernet/nxp/lpc_eth.c | 2 drivers/net/ethernet/qlogic/qed/qed_dev.c | 2 drivers/net/ethernet/qlogic/qed/qed_dev_api.h | 2 drivers/net/ethernet/qlogic/qed/qed_l2.c | 2 drivers/net/ethernet/qlogic/qed/qed_main.c | 2 drivers/net/ethernet/qlogic/qed/qed_mcp.c | 2 drivers/net/ethernet/qlogic/qed/qed_mcp.h | 2 drivers/net/ethernet/qlogic/qed/qed_rdma.c | 2 drivers/net/ethernet/qlogic/qed/qed_vf.c | 2 drivers/net/ethernet/qlogic/qed/qed_vf.h | 4 drivers/net/ethernet/qlogic/qede/qede_filter.c | 2 drivers/net/ethernet/qualcomm/emac/emac-mac.c | 2 drivers/net/ethernet/rdc/r6040.c | 12 drivers/net/ethernet/samsung/sxgbe/sxgbe_common.h | 2 drivers/net/ethernet/samsung/sxgbe/sxgbe_core.c | 3 drivers/net/ethernet/sfc/ef10.c | 4 drivers/net/ethernet/sfc/ef10_sriov.c | 2 drivers/net/ethernet/sfc/ef10_sriov.h | 6 drivers/net/ethernet/sfc/net_driver.h | 2 drivers/net/ethernet/sfc/siena_sriov.c | 2 drivers/net/ethernet/sfc/siena_sriov.h | 2 drivers/net/ethernet/sis/sis900.c | 2 drivers/net/ethernet/smsc/smsc911x.c | 2 drivers/net/ethernet/smsc/smsc9420.c | 2 drivers/net/ethernet/stmicro/stmmac/common.h | 4 drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 2 drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c | 2 drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c | 2 drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 2 drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c | 2 drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c | 2 drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 3 drivers/net/ethernet/stmicro/stmmac/hwif.h | 3 drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c | 4 drivers/net/ethernet/sun/sunbmac.c | 2 drivers/net/ethernet/sun/sunqe.c | 2 drivers/net/ethernet/synopsys/dwc-xlgmac-hw.c | 2 drivers/net/ethernet/synopsys/dwc-xlgmac.h | 2 drivers/net/ethernet/ti/tlan.c | 4 drivers/net/ethernet/toshiba/tc35815.c | 3 drivers/net/ethernet/xilinx/xilinx_emaclite.c | 7 drivers/net/ethernet/xircom/xirc2ps_cs.c | 2 drivers/net/phy/mscc/mscc_main.c | 2 drivers/net/usb/aqc111.c | 2 drivers/net/usb/ax88179_178a.c | 224 ++++---- drivers/net/usb/catc.c | 2 drivers/net/usb/dm9601.c | 3 drivers/net/usb/mcs7830.c | 3 drivers/net/usb/sr9700.c | 3 drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 4 drivers/pinctrl/pinctrl-at91-pio4.c | 8 drivers/reset/core.c | 8 drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 9 drivers/scsi/scsi_error.c | 2 drivers/spi/spi.c | 12 drivers/usb/host/fotg210-hcd.c | 3 drivers/usb/serial/ftdi_sio.c | 6 drivers/usb/serial/ftdi_sio_ids.h | 6 drivers/usb/serial/option.c | 5 fs/Kconfig | 4 fs/afs/cell.c | 67 +- fs/afs/cmservice.c | 2 fs/afs/dynroot.c | 31 - fs/afs/internal.h | 18 fs/afs/proc.c | 6 fs/afs/rxrpc.c | 26 - fs/afs/server.c | 40 - fs/afs/vl_list.c | 19 fs/afs/volume.c | 47 + fs/cifs/misc.c | 4 fs/cifs/smb2misc.c | 26 - fs/cifs/smb2ops.c | 26 - fs/cifs/smb2pdu.c | 29 - fs/cifs/smb2pdu.h | 2 fs/fuse/fuse_i.h | 15 fs/fuse/inode.c | 75 ++ fs/ksmbd/oplock.c | 115 ++++ fs/ksmbd/oplock.h | 8 fs/ksmbd/smb2misc.c | 15 fs/ksmbd/smb2ops.c | 9 fs/ksmbd/smb2pdu.c | 61 +- fs/ksmbd/smb2pdu.h | 1 fs/ksmbd/vfs.c | 3 fs/ksmbd/vfs_cache.c | 13 fs/ksmbd/vfs_cache.h | 3 include/linux/bpf.h | 3 include/linux/key-type.h | 1 include/linux/property.h | 9 include/linux/qed/qed_eth_if.h | 2 include/linux/qed/qed_if.h | 2 include/linux/qed/qed_rdma_if.h | 3 include/linux/spi/spi.h | 3 include/net/bluetooth/hci_core.h | 5 include/trace/events/afs.h | 26 - kernel/bpf/arraymap.c | 58 -- kernel/trace/ring_buffer.c | 136 +---- kernel/trace/synth_event_gen_test.c | 11 kernel/trace/trace.c | 20 lib/vsprintf.c | 11 mm/filemap.c | 9 net/8021q/vlan_core.c | 9 net/9p/protocol.c | 17 net/bluetooth/af_bluetooth.c | 7 net/bluetooth/hci_event.c | 3 net/bluetooth/l2cap_core.c | 21 net/bluetooth/mgmt.c | 25 net/bluetooth/smp.c | 7 net/core/dev.c | 3 net/dns_resolver/dns_key.c | 10 net/ife/ife.c | 1 net/mac80211/mesh_plink.c | 10 net/netfilter/nf_tables_api.c | 2 net/rfkill/rfkill-gpio.c | 8 net/rose/af_rose.c | 39 + net/wireless/certs/wens.hex | 87 +++ security/keys/gc.c | 31 - security/keys/internal.h | 11 security/keys/key.c | 15 security/keys/proc.c | 2 sound/soc/codecs/hdmi-codec.c | 12 sound/usb/quirks.c | 4 243 files changed, 1795 insertions(+), 1078 deletions(-) Alexander Atanasov (1): scsi: core: Always send batch on reset or error handling command Alexis Lothoré (1): pinctrl: at91-pio4: use dedicated lock class for IRQ Alper Ak (1): USB: serial: option: add Quectel EG912Y module support Andrew Davis (1): ARM: dts: dra7: Fix DRA7 L3 NoC node register size Andy Shevchenko (3): device property: Add const qualifier to device_get_match_data() parameter spi: Introduce spi_get_device_match_data() helper device property: Allow const parameter to dev_fwnode() Baokun Li (1): mm/filemap: avoid buffered read/write race to read inconsistent data Chen-Yu Tsai (1): wifi: cfg80211: Add my certificate Christoffer Sandberg (1): Input: soc_button_array - add mapping for airplane mode button Dan Carpenter (1): usb: fotg210-hcd: delete an incorrect bounds test David Howells (6): afs: Fix the dynamic root's d_delete to always delete unused dentries afs: Fix dynamic root lookup DNS check keys, dns: Allow key types (eg. DNS) to be reclaimed immediately on expiry afs: Fix overwriting of result of DNS query afs: Use refcount_t rather than atomic_t afs: Fix use-after-free due to get/remove race in volume tree David Lechner (1): iio: triggered-buffer: prevent possible freeing of wrong buffer Dinghao Liu (1): net/mlx5e: fix a potential double-free in fs_udp_create_groups Eric Dumazet (3): net: sched: ife: fix potential use-after-free net/rose: fix races in rose_kill_by_device() net: check dev->gso_max_size in gso_features_check() Fabio Estevam (1): dt-bindings: nvmem: mxs-ocotp: Document fsl,ocotp Fedor Pchelkin (1): net: 9p: avoid freeing uninit memory in p9pdu_vreadf Frédéric Danis (1): Bluetooth: L2CAP: Send reject on command corrupted request Geert Uytterhoeven (1): reset: Fix crash when freeing non-existent optional resets Greg Kroah-Hartman (1): Linux 5.15.146 Haoran Liu (1): Input: ipaq-micro-keys - add error handling for devm_kmemdup Heiko Carstens (1): s390/vx: fix save/restore of fpu kernel context Herve Codina (1): lib/vsprintf: Fix %pfwf when current node refcount == 0 Hyunwoo Kim (1): Bluetooth: af_bluetooth: Fix Use-After-Free in bt_sock_recvmsg Jakub Kicinski (1): ethernet: constify references to netdev->dev_addr in drivers Javier Carrasco (1): iio: common: ms_sensors: ms_sensors_i2c: fix humidity conversion time table Jeremie Knuesel (1): ALSA: usb-audio: Increase delay in MOTU M quirk Jerome Brunet (1): ASoC: hdmi-codec: fix missing report for jack initial status Jiri Olsa (1): bpf: Fix prog_array_map_poke_run map poke update Johannes Berg (3): wifi: iwlwifi: pcie: add another missing bh-disable for rxq->lock wifi: mac80211: mesh_plink: fix matches_local logic wifi: cfg80211: fix certs build to not depend on file order Jose Ignacio Tornos Martinez (1): net: usb: ax88179_178a: avoid failed operations when device is disconnected Justin Chen (2): net: usb: ax88179_178a: clean up pm calls net: usb: ax88179_178a: wol optimizations Kent Gibson (1): gpiolib: cdev: add gpio_device locking wrapper around gpio_ioctl() Krister Johansen (1): fuse: share lookup state between submount and its parent Kunwu Chan (1): ARM: OMAP2+: Fix null pointer dereference and memory leak in omap_soc_device_init Liu Jian (1): net: check vlan filter feature in vlan_vids_add_by_dev() and vlan_vids_del_by_dev() Luca Coelho (1): drm/i915/mtl: limit second scaler vertical scaling in ver >= 14 Luiz Augusto von Dentz (1): Bluetooth: hci_event: Fix not checking if HCI_OP_INQUIRY has been sent Marc Zyngier (1): KVM: arm64: vgic: Force vcpu vgic teardown on vcpu destroy Mark Glover (1): USB: serial: ftdi_sio: update Actisense PIDs constant names Mike Tipton (1): interconnect: Treat xlate() returning NULL node as an error Mikulas Patocka (1): dm-integrity: don't modify bio's immutable bio_vec in integrity_metadata() Moshe Shemesh (1): net/mlx5: Fix fw tracer first block check Namjae Jeon (10): ksmbd: fix wrong name of SMB2_CREATE_ALLOCATION_SIZE ksmbd: have a dependency on cifs ARC4 ksmbd: set epoch in create context v2 lease ksmbd: set v2 lease capability ksmbd: downgrade RWH lease caching state to RH for directory ksmbd: send v2 lease break notification for directory ksmbd: lazy v2 lease break on smb2_write() ksmbd: avoid duplicate opinfo_put() call on error of smb21_lease_break_ack() ksmbd: fix wrong allocation size update in smb2_open() ksmbd: fix slab-out-of-bounds in smb_strndup_from_utf16() Nuno Sa (1): iio: imu: adis16475: add spi_device_id table Pablo Neira Ayuso (1): netfilter: nf_tables: skip set commit for deleted/destroyed sets Paulo Alcantara (4): smb: client: fix NULL deref in asn1_ber_decoder() smb: client: fix OOB in smb2_query_reparse_point() smb: client: fix OOB in SMB2_query_info_init() smb: client: fix OOB in smbCalcSize() Quan Nguyen (1): i2c: aspeed: Handle the coalesced stop conditions with the start conditions. Rahul Rameshbabu (1): net/mlx5e: Correct snprintf truncation handling for fw_version buffer used by representors Reinhard Speyerer (1): USB: serial: option: add Quectel RM500Q R13 firmware support Ronald Wahl (1): net: ks8851: Fix TX stall caused by TX buffer overrun Rouven Czerwinski (1): net: rfkill: gpio: set GPIO direction Shifeng Li (1): net/mlx5e: Fix slab-out-of-bounds in mlx5_query_nic_vport_mac_list() Slark Xiao (1): USB: serial: option: add Foxconn T99W265 with new baseline Steven Rostedt (Google) (5): tracing / synthetic: Disable events after testing in synth_event_gen_test_init() ring-buffer: Fix wake ups when buffer_percent is set to 100 tracing: Fix blocked reader of snapshot buffer ring-buffer: Remove useless update to write_stamp in rb_try_to_discard() ring-buffer: Fix slowpath of interrupted event Su Hui (1): iio: imu: inv_mpu6050: fix an error code problem in inv_mpu6050_read_raw Thomas Gleixner (1): x86/alternatives: Sync core before enabling interrupts Tony Lindgren (2): bus: ti-sysc: Flush posted write only after srst_udelay ARM: dts: Fix occasional boot hang for am3 usb Ville Syrjälä (2): drm/i915: Relocate intel_atomic_setup_scalers() drm/i915: Fix intel_atomic_setup_scalers() plane_state handling Vlad Buslov (2): Revert "net/mlx5e: fix double free of encap_header in update funcs" Revert "net/mlx5e: fix double free of encap_header" Wadim Egorov (1): iio: adc: ti_am335x_adc: Fix return value check of tiadc_request_dma() Wei Yongjun (1): scsi: bnx2fc: Fix skb double free in bnx2fc_rcv() Xiao Yao (1): Bluetooth: MGMT/SMP: Fix address type when using SMP over BREDR/LE Yury Norov (1): net: mana: select PAGE_POOL Zhipeng Lu (1): ethernet: atheros: fix a memleak in atl1e_setup_ring_resources xiongxin (1): gpio: dwapb: mask/unmask IRQ when disable/enale it

1 year, 1 month

1
1
0 0

[PATCH v2] PM / devfreq: Fix buffer overflow in trans_stat_show

by Christian Marangi

Fix buffer overflow in trans_stat_show(). Convert simple snprintf to the more secure sysfs_emit. Add condition checking if we are exceeding PAGE_SIZE and exit early from loop. Also add at the end a warning that we exceeded PAGE_SIZE and that stats is disabled. Return -EFBIG in the case where we don't have enough space to write the full transition table. Also document in the ABI that this function can return -EFBIG error. Cc: stable(a)vger.kernel.org Closes: https://bugzilla.kernel.org/show_bug.cgi?id=218041 Fixes: e552bbaf5b98 ("PM / devfreq: Add sysfs node for representing frequency transition information.") Signed-off-by: Christian Marangi <ansuelsmth(a)gmail.com> --- Changes v2: - Squash and use directly sysfs_emit - Fix typo for df->freq_table[2] - Reduce check of PAGE_SIZE to only at the start of for loops Documentation/ABI/testing/sysfs-class-devfreq | 3 ++ drivers/devfreq/devfreq.c | 47 ++++++++++++------- 2 files changed, 33 insertions(+), 17 deletions(-) diff --git a/Documentation/ABI/testing/sysfs-class-devfreq b/Documentation/ABI/testing/sysfs-class-devfreq index 5e6b74f30406..1e7e0bb4c14e 100644 --- a/Documentation/ABI/testing/sysfs-class-devfreq +++ b/Documentation/ABI/testing/sysfs-class-devfreq @@ -52,6 +52,9 @@ Description: echo 0 > /sys/class/devfreq/.../trans_stat + If the transition table is bigger than PAGE_SIZE, reading + this will return an -EFBIG error. + What: /sys/class/devfreq/.../available_frequencies Date: October 2012 Contact: Nishanth Menon <nm(a)ti.com> diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c index 63347a5ae599..3b8019ab523d 100644 --- a/drivers/devfreq/devfreq.c +++ b/drivers/devfreq/devfreq.c @@ -1688,7 +1688,7 @@ static ssize_t trans_stat_show(struct device *dev, struct device_attribute *attr, char *buf) { struct devfreq *df = to_devfreq(dev); - ssize_t len; + ssize_t len = 0; int i, j; unsigned int max_state; @@ -1697,7 +1697,7 @@ static ssize_t trans_stat_show(struct device *dev, max_state = df->max_state; if (max_state == 0) - return sprintf(buf, "Not Supported.\n"); + return sysfs_emit(buf, "Not Supported.\n"); mutex_lock(&df->lock); if (!df->stop_polling && @@ -1707,31 +1707,44 @@ static ssize_t trans_stat_show(struct device *dev, } mutex_unlock(&df->lock); - len = sprintf(buf, " From : To\n"); - len += sprintf(buf + len, " :"); - for (i = 0; i < max_state; i++) - len += sprintf(buf + len, "%10lu", - df->freq_table[i]); + len += sysfs_emit_at(buf, len, " From : To\n"); + len += sysfs_emit_at(buf, len, " :"); + for (i = 0; i < max_state; i++) { + if (len >= PAGE_SIZE - 1) + break; + len += sysfs_emit_at(buf, len, "%10lu", + df->freq_table[i]); + } - len += sprintf(buf + len, " time(ms)\n"); + len += sysfs_emit_at(buf, len, " time(ms)\n"); for (i = 0; i < max_state; i++) { + if (len >= PAGE_SIZE - 1) + break; if (df->freq_table[i] == df->previous_freq) - len += sprintf(buf + len, "*"); + len += sysfs_emit_at(buf, len, "*"); else - len += sprintf(buf + len, " "); + len += sysfs_emit_at(buf, len, " "); - len += sprintf(buf + len, "%10lu:", df->freq_table[i]); - for (j = 0; j < max_state; j++) - len += sprintf(buf + len, "%10u", + len += sysfs_emit_at(buf, len, "%10lu:", df->freq_table[i]); + for (j = 0; j < max_state; j++) { + if (len >= PAGE_SIZE - 1) + break; + len += sysfs_emit_at(buf, len, "%10u", df->stats.trans_table[(i * max_state) + j]); + } + + len += sysfs_emit_at(buf, len, "%10llu\n", (u64) + jiffies64_to_msecs(df->stats.time_in_state[i])); + } - len += sprintf(buf + len, "%10llu\n", (u64) - jiffies64_to_msecs(df->stats.time_in_state[i])); + len += sysfs_emit_at(buf, len, "Total transition : %u\n", + df->stats.total_trans); + if (len >= PAGE_SIZE - 1) { + pr_warn_once("devfreq transition table exceeds PAGE_SIZE. Disabling\n"); + return -EFBIG; } - len += sprintf(buf + len, "Total transition : %u\n", - df->stats.total_trans); return len; } -- 2.43.0

1 year, 1 month

1
0
0 0

FAILED: patch "[PATCH] block: Don't invalidate pagecache for invalid falloc modes" failed to apply to 4.14-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.14-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-4.14.y git checkout FETCH_HEAD git cherry-pick -x 1364a3c391aedfeb32aa025303ead3d7c91cdf9d # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023101517-patriarch-reuse-cc1c@gregkh' --subject-prefix 'PATCH 4.14.y' HEAD^.. Possible dependencies: 1364a3c391ae ("block: Don't invalidate pagecache for invalid falloc modes") 05bdb9965305 ("block: replace fmode_t with a block-specific type for block open flags") 5e4ea834676e ("block: remove unused fmode_t arguments from ioctl handlers") cfb425761c79 ("block: move a few internal definitions out of blkdev.h") 99b07780814e ("rnbd-srv: replace sess->open_flags with a "bool readonly"") 658afed19cee ("mtd: block: use a simple bool to track open for write") 7d9d7d59d44b ("nvme: replace the fmode_t argument to the nvme ioctl handlers with a simple bool") 2e80089c1824 ("scsi: replace the fmode_t argument to scsi_ioctl with a simple bool") 5f4eb9d5413f ("scsi: replace the fmode_t argument to scsi_cmd_allowed with a simple bool") 81b1fb7d17c0 ("fs: remove sb->s_mode") 3f0b3e785e8b ("block: add a sb_open_mode helper") 2736e8eeb0cc ("block: use the holder as indication for exclusive opens") 2ef789288afd ("btrfs: don't pass a holder for non-exclusive blkdev_get_by_path") 29499ab060fe ("bcache: don't pass a stack address to blkdev_get_by_path") c889d0793d9d ("swsusp: don't pass a stack address to blkdev_get_by_path") ae220766d87c ("block: remove the unused mode argument to ->release") d32e2bf83791 ("block: pass a gendisk to ->open") 444aa2c58cb3 ("block: pass a gendisk on bdev_check_media_change") 7ae24fcee992 ("cdrom: remove the unused mode argument to cdrom_release") 473399b50de1 ("cdrom: remove the unused mode argument to cdrom_ioctl") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 1364a3c391aedfeb32aa025303ead3d7c91cdf9d Mon Sep 17 00:00:00 2001 From: Sarthak Kukreti <sarthakkukreti(a)chromium.org> Date: Wed, 11 Oct 2023 13:12:30 -0700 Subject: [PATCH] block: Don't invalidate pagecache for invalid falloc modes Only call truncate_bdev_range() if the fallocate mode is supported. This fixes a bug where data in the pagecache could be invalidated if the fallocate() was called on the block device with an invalid mode. Fixes: 25f4c41415e5 ("block: implement (some of) fallocate for block devices") Cc: stable(a)vger.kernel.org Reported-by: "Darrick J. Wong" <djwong(a)kernel.org> Signed-off-by: Sarthak Kukreti <sarthakkukreti(a)chromium.org> Reviewed-by: Christoph Hellwig <hch(a)lst.de> Reviewed-by: "Darrick J. Wong" <djwong(a)kernel.org> Signed-off-by: Mike Snitzer <snitzer(a)kernel.org> Fixes: line? I've never seen those wrapped. Link: https://lore.kernel.org/r/20231011201230.750105-1-sarthakkukreti@chromium.o… Signed-off-by: Jens Axboe <axboe(a)kernel.dk> diff --git a/block/fops.c b/block/fops.c index acff3d5d22d4..73e42742543f 100644 --- a/block/fops.c +++ b/block/fops.c @@ -772,24 +772,35 @@ static long blkdev_fallocate(struct file *file, int mode, loff_t start, filemap_invalidate_lock(inode->i_mapping); - /* Invalidate the page cache, including dirty pages. */ - error = truncate_bdev_range(bdev, file_to_blk_mode(file), start, end); - if (error) - goto fail; - + /* + * Invalidate the page cache, including dirty pages, for valid + * de-allocate mode calls to fallocate(). + */ switch (mode) { case FALLOC_FL_ZERO_RANGE: case FALLOC_FL_ZERO_RANGE | FALLOC_FL_KEEP_SIZE: + error = truncate_bdev_range(bdev, file_to_blk_mode(file), start, end); + if (error) + goto fail; + error = blkdev_issue_zeroout(bdev, start >> SECTOR_SHIFT, len >> SECTOR_SHIFT, GFP_KERNEL, BLKDEV_ZERO_NOUNMAP); break; case FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE: + error = truncate_bdev_range(bdev, file_to_blk_mode(file), start, end); + if (error) + goto fail; + error = blkdev_issue_zeroout(bdev, start >> SECTOR_SHIFT, len >> SECTOR_SHIFT, GFP_KERNEL, BLKDEV_ZERO_NOFALLBACK); break; case FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE | FALLOC_FL_NO_HIDE_STALE: + error = truncate_bdev_range(bdev, file_to_blk_mode(file), start, end); + if (error) + goto fail; + error = blkdev_issue_discard(bdev, start >> SECTOR_SHIFT, len >> SECTOR_SHIFT, GFP_KERNEL); break;

1 year, 1 month

3
2
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror January 2024