August 2023 - Linux-stable-mirror

FAILED: patch "[PATCH] selftests/rseq: Play nice with binaries statically linked" failed to apply to 6.4-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 6.4-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-6.4.y git checkout FETCH_HEAD git cherry-pick -x 3bcbc20942db5d738221cca31a928efc09827069 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023080240-perkiness-immature-a43c@gregkh' --subject-prefix 'PATCH 6.4.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 3bcbc20942db5d738221cca31a928efc09827069 Mon Sep 17 00:00:00 2001 From: Sean Christopherson <seanjc(a)google.com> Date: Fri, 21 Jul 2023 15:33:52 -0700 Subject: [PATCH] selftests/rseq: Play nice with binaries statically linked against glibc 2.35+ To allow running rseq and KVM's rseq selftests as statically linked binaries, initialize the various "trampoline" pointers to point directly at the expect glibc symbols, and skip the dlysm() lookups if the rseq size is non-zero, i.e. the binary is statically linked *and* the libc registered its own rseq. Define weak versions of the symbols so as not to break linking against libc versions that don't support rseq in any capacity. The KVM selftests in particular are often statically linked so that they can be run on targets with very limited runtime environments, i.e. test machines. Fixes: 233e667e1ae3 ("selftests/rseq: Uplift rseq selftests for compatibility with glibc-2.35") Cc: Aaron Lewis <aaronlewis(a)google.com> Cc: kvm(a)vger.kernel.org Cc: stable(a)vger.kernel.org Signed-off-by: Sean Christopherson <seanjc(a)google.com> Message-Id: <20230721223352.2333911-1-seanjc(a)google.com> Signed-off-by: Paolo Bonzini <pbonzini(a)redhat.com> diff --git a/tools/testing/selftests/rseq/rseq.c b/tools/testing/selftests/rseq/rseq.c index 4e4aa006004c..a723da253244 100644 --- a/tools/testing/selftests/rseq/rseq.c +++ b/tools/testing/selftests/rseq/rseq.c @@ -34,9 +34,17 @@ #include "../kselftest.h" #include "rseq.h" -static const ptrdiff_t *libc_rseq_offset_p; -static const unsigned int *libc_rseq_size_p; -static const unsigned int *libc_rseq_flags_p; +/* + * Define weak versions to play nice with binaries that are statically linked + * against a libc that doesn't support registering its own rseq. + */ +__weak ptrdiff_t __rseq_offset; +__weak unsigned int __rseq_size; +__weak unsigned int __rseq_flags; + +static const ptrdiff_t *libc_rseq_offset_p = &__rseq_offset; +static const unsigned int *libc_rseq_size_p = &__rseq_size; +static const unsigned int *libc_rseq_flags_p = &__rseq_flags; /* Offset from the thread pointer to the rseq area. */ ptrdiff_t rseq_offset; @@ -155,9 +163,17 @@ unsigned int get_rseq_feature_size(void) static __attribute__((constructor)) void rseq_init(void) { - libc_rseq_offset_p = dlsym(RTLD_NEXT, "__rseq_offset"); - libc_rseq_size_p = dlsym(RTLD_NEXT, "__rseq_size"); - libc_rseq_flags_p = dlsym(RTLD_NEXT, "__rseq_flags"); + /* + * If the libc's registered rseq size isn't already valid, it may be + * because the binary is dynamically linked and not necessarily due to + * libc not having registered a restartable sequence. Try to find the + * symbols if that's the case. + */ + if (!*libc_rseq_size_p) { + libc_rseq_offset_p = dlsym(RTLD_NEXT, "__rseq_offset"); + libc_rseq_size_p = dlsym(RTLD_NEXT, "__rseq_size"); + libc_rseq_flags_p = dlsym(RTLD_NEXT, "__rseq_flags"); + } if (libc_rseq_size_p && libc_rseq_offset_p && libc_rseq_flags_p && *libc_rseq_size_p != 0) { /* rseq registration owned by glibc */

1 year, 5 months

1
0
0 0

[PATCH 20/22] drm/amd/display: Fix backlight off cmd for OLED panel

by Tom Chung

From: Swapnil Patel <swapnil.patel(a)amd.com> [Why] Currently driver fails to send backlight off command while powering down. This is because in dce110_edp_backlight_control, current backlight status isn't being acccessed correctly for OLED panel with AUX control. [How] Add support for accessing current backlight status for OLED panels with AUX control. Cc: Mario Limonciello <mario.limonciello(a)amd.com> Cc: Alex Deucher <alexander.deucher(a)amd.com> Cc: stable(a)vger.kernel.org Reviewed-by: Wenjing Liu <wenjing.liu(a)amd.com> Acked-by: Tom Chung <chiahsuan.chung(a)amd.com> Signed-off-by: Swapnil Patel <swapnil.patel(a)amd.com> --- .../display/dc/dce110/dce110_hw_sequencer.c | 3 +-- drivers/gpu/drm/amd/display/dc/inc/link.h | 1 + .../drm/amd/display/dc/link/link_factory.c | 1 + .../link/protocols/link_edp_panel_control.c | 19 +++++++++++++++++++ .../link/protocols/link_edp_panel_control.h | 1 + 5 files changed, 23 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c index bf2d7fbaccd7..e50da69a2b97 100644 --- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c @@ -965,8 +965,7 @@ void dce110_edp_backlight_control( } if (link->panel_cntl) { - bool is_backlight_on = link->panel_cntl->funcs->is_panel_backlight_on(link->panel_cntl); - + bool is_backlight_on = ctx->dc->link_srv->edp_get_backlight_enable_status(link); if ((enable && is_backlight_on) || (!enable && !is_backlight_on)) { DC_LOG_HW_RESUME_S3( "%s: panel already powered up/off. Do nothing.\n", diff --git a/drivers/gpu/drm/amd/display/dc/inc/link.h b/drivers/gpu/drm/amd/display/dc/inc/link.h index f839494d59d8..dad730792a9a 100644 --- a/drivers/gpu/drm/amd/display/dc/inc/link.h +++ b/drivers/gpu/drm/amd/display/dc/inc/link.h @@ -273,6 +273,7 @@ struct link_service { bool (*edp_is_ilr_optimization_required)(struct dc_link *link, struct dc_crtc_timing *crtc_timing); bool (*edp_backlight_enable_aux)(struct dc_link *link, bool enable); + bool (*edp_get_backlight_enable_status)(struct dc_link *link); void (*edp_add_delay_for_T9)(struct dc_link *link); bool (*edp_receiver_ready_T9)(struct dc_link *link); bool (*edp_receiver_ready_T7)(struct dc_link *link); diff --git a/drivers/gpu/drm/amd/display/dc/link/link_factory.c b/drivers/gpu/drm/amd/display/dc/link/link_factory.c index ac1c3e2e7c1d..cab68b5c80f3 100644 --- a/drivers/gpu/drm/amd/display/dc/link/link_factory.c +++ b/drivers/gpu/drm/amd/display/dc/link/link_factory.c @@ -211,6 +211,7 @@ static void construct_link_service_edp_panel_control(struct link_service *link_s link_srv->edp_is_ilr_optimization_required = edp_is_ilr_optimization_required; link_srv->edp_backlight_enable_aux = edp_backlight_enable_aux; + link_srv->edp_get_backlight_enable_status = edp_get_backlight_enable_status; link_srv->edp_add_delay_for_T9 = edp_add_delay_for_T9; link_srv->edp_receiver_ready_T9 = edp_receiver_ready_T9; link_srv->edp_receiver_ready_T7 = edp_receiver_ready_T7; diff --git a/drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.c b/drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.c index 8b360c09e0e8..adebcef00e74 100644 --- a/drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.c +++ b/drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.c @@ -243,6 +243,25 @@ bool edp_backlight_enable_aux(struct dc_link *link, bool enable) return true; } +bool edp_get_backlight_enable_status(struct dc_link *link) +{ + uint8_t backlight_status = 0; + + if (!link || (link->connector_signal != SIGNAL_TYPE_EDP && + link->connector_signal != SIGNAL_TYPE_DISPLAY_PORT)) + return false; + + if (link->dpcd_sink_ext_caps.bits.oled || + link->dpcd_sink_ext_caps.bits.hdr_aux_backlight_control == 1 || + link->dpcd_sink_ext_caps.bits.sdr_aux_backlight_control == 1) { + if (core_link_read_dpcd(link, DP_SOURCE_BACKLIGHT_ENABLE, + &backlight_status, 1) != DC_OK) + return false; + return (backlight_status > 0); + } else + return link->panel_cntl->funcs->is_panel_backlight_on(link->panel_cntl); +} + // we read default from 0x320 because we expect BIOS wrote it there // regular get_backlight_nit reads from panel set at 0x326 static bool read_default_bl_aux(struct dc_link *link, uint32_t *backlight_millinits) diff --git a/drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.h b/drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.h index fa89bdb3a336..f2ab8799ddf1 100644 --- a/drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.h +++ b/drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.h @@ -57,6 +57,7 @@ bool edp_wait_for_t12(struct dc_link *link); bool edp_is_ilr_optimization_required(struct dc_link *link, struct dc_crtc_timing *crtc_timing); bool edp_backlight_enable_aux(struct dc_link *link, bool enable); +bool edp_get_backlight_enable_status(struct dc_link *link); void edp_add_delay_for_T9(struct dc_link *link); bool edp_receiver_ready_T9(struct dc_link *link); bool edp_receiver_ready_T7(struct dc_link *link); -- 2.25.1

1 year, 5 months

1
0
0 0

[PATCH 04/22] drm/amd/display: Fix a bug when searching for insert_above_mpcc

by Tom Chung

From: Wesley Chalmers <wesley.chalmers(a)amd.com> [WHY] Currently, when insert_plane is called with insert_above_mpcc parameter that is equal to tree->opp_list, the function returns NULL. [HOW] Instead, the function should insert the plane at the top of the tree. Cc: Mario Limonciello <mario.limonciello(a)amd.com> Cc: Alex Deucher <alexander.deucher(a)amd.com> Cc: stable(a)vger.kernel.org Reviewed-by: Jun Lei <jun.lei(a)amd.com> Acked-by: Tom Chung <chiahsuan.chung(a)amd.com> Signed-off-by: Wesley Chalmers <wesley.chalmers(a)amd.com> --- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c index 8e9384094f6d..f2f55565e98a 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c +++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c @@ -212,8 +212,9 @@ struct mpcc *mpc1_insert_plane( /* check insert_above_mpcc exist in tree->opp_list */ struct mpcc *temp_mpcc = tree->opp_list; - while (temp_mpcc && temp_mpcc->mpcc_bot != insert_above_mpcc) - temp_mpcc = temp_mpcc->mpcc_bot; + if (temp_mpcc != insert_above_mpcc) + while (temp_mpcc && temp_mpcc->mpcc_bot != insert_above_mpcc) + temp_mpcc = temp_mpcc->mpcc_bot; if (temp_mpcc == NULL) return NULL; } -- 2.25.1

1 year, 5 months

1
0
0 0

[PATCH 01/22] drm/amd/display: fix a regression in blank pixel data caused by coding mistake

by Tom Chung

From: Wenjing Liu <wenjing.liu(a)amd.com> [why] There was unfortunately a coding mistake. It gets caught with an ultrawide monitor that requires ODM 4:1 combine. We are blanking or unblanking pixel data we are supposed to enumerate through all ODM pipes and program DPG for each of those pipes. However the coding mistake causes us to program only the first and last ODM pipes. Cc: Mario Limonciello <mario.limonciello(a)amd.com> Cc: Alex Deucher <alexander.deucher(a)amd.com> Cc: stable(a)vger.kernel.org Reviewed-by: Martin Leung <martin.leung(a)amd.com> Acked-by: Tom Chung <chiahsuan.chung(a)amd.com> Signed-off-by: Wenjing Liu <wenjing.liu(a)amd.com> --- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 2 +- drivers/gpu/drm/amd/display/dc/link/accessories/link_dp_cts.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c index fc1af33dbe3c..b196b7ff1a0d 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c +++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c @@ -1084,7 +1084,7 @@ void dcn20_blank_pixel_data( while (odm_pipe->next_odm_pipe) { dc->hwss.set_disp_pattern_generator(dc, - pipe_ctx, + odm_pipe, test_pattern, test_pattern_color_space, stream->timing.display_color_depth, diff --git a/drivers/gpu/drm/amd/display/dc/link/accessories/link_dp_cts.c b/drivers/gpu/drm/amd/display/dc/link/accessories/link_dp_cts.c index bce0428ad612..9fd68a11fad2 100644 --- a/drivers/gpu/drm/amd/display/dc/link/accessories/link_dp_cts.c +++ b/drivers/gpu/drm/amd/display/dc/link/accessories/link_dp_cts.c @@ -513,7 +513,7 @@ static void set_crtc_test_pattern(struct dc_link *link, odm_opp = odm_pipe->stream_res.opp; odm_opp->funcs->opp_program_bit_depth_reduction(odm_opp, &params); link->dc->hwss.set_disp_pattern_generator(link->dc, - pipe_ctx, + odm_pipe, controller_test_pattern, controller_color_space, color_depth, -- 2.25.1

1 year, 5 months

1
0
0 0

[PATCH 5.15 000/155] 5.15.124-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.15.124 release. There are 155 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 Thu, 03 Aug 2023 09:18:38 +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.15.124-r… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.15.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.15.124-rc1 Matthieu Baerts <matthieu.baerts(a)tessares.net> selftests: mptcp: join: only check for ip6tables if needed Thomas Petazzoni <thomas.petazzoni(a)bootlin.com> ASoC: cs42l51: fix driver to properly autoload with automatic module loading Jens Axboe <axboe(a)kernel.dk> io_uring: treat -EAGAIN for REQ_F_NOWAIT as final for io-wq Matthieu Baerts <matthieu.baerts(a)tessares.net> selftests: mptcp: sockopt: use 'iptables-legacy' if available Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> cpufreq: intel_pstate: Drop ACPI _PSS states table patching Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> ACPI: processor: perflib: Avoid updating frequency QoS unnecessarily Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> ACPI: processor: perflib: Use the "no limit" frequency QoS Steven Rostedt (Google) <rostedt(a)goodmis.org> tracing: Fix trace_event_raw_event_synth() if else statement Ilya Dryomov <idryomov(a)gmail.com> rbd: retrieve and check lock owner twice before blocklisting Ilya Dryomov <idryomov(a)gmail.com> rbd: harden get_lock_owner_info() a bit Ilya Dryomov <idryomov(a)gmail.com> rbd: make get_lock_owner_info() return a single locker or NULL Joe Thornber <ejt(a)redhat.com> dm cache policy smq: ensure IO doesn't prevent cleaner policy progress Xiubo Li <xiubli(a)redhat.com> ceph: never send metrics if disable_send_metrics is set Mark Brown <broonie(a)kernel.org> ASoC: wm8904: Fill the cache for WM8904_ADC_TEST_0 register Stefan Haberland <sth(a)linux.ibm.com> s390/dasd: fix hanging device after quiesce/resume Jason Wang <jasowang(a)redhat.com> virtio-net: fix race between set queues and probe Sean Christopherson <seanjc(a)google.com> KVM: x86: Disallow KVM_SET_SREGS{2} if incoming CR0 is invalid Peter Zijlstra <peterz(a)infradead.org> locking/rtmutex: Fix task->pi_waiters integrity Marc Zyngier <maz(a)kernel.org> irqchip/gic-v4.1: Properly lock VPEs when doing a directLPI invalidation Jonas Gorski <jonas.gorski(a)gmail.com> irq-bcm6345-l1: Do not assume a fixed block to cpu mapping Alexander Steffen <Alexander.Steffen(a)infineon.com> tpm_tis: Explicitly check for error code Trond Myklebust <trond.myklebust(a)hammerspace.com> nfsd: Remove incorrect check in nfsd4_validate_stateid Christian Brauner <brauner(a)kernel.org> file: always lock position for FMODE_ATOMIC_POS Filipe Manana <fdmanana(a)suse.com> btrfs: check for commit error at btrfs_attach_transaction_barrier() Filipe Manana <fdmanana(a)suse.com> btrfs: check if the transaction was aborted at btrfs_wait_for_commit() Gilles Buloz <Gilles.Buloz(a)kontron.com> hwmon: (nct7802) Fix for temp6 (PECI1) processed even if PECI1 disabled Baskaran Kannan <Baski.Kannan(a)amd.com> hwmon: (k10temp) Enable AMD3255 Proc to show negative temperature Luka Guzenko <l.guzenko(a)web.de> ALSA: hda/relatek: Enable Mute LED on HP 250 G8 Oliver Neukum <oneukum(a)suse.com> Revert "xhci: add quirk for host controllers that don't update endpoint DCS" Chaoyuan Peng <hedonistsmith(a)gmail.com> tty: n_gsm: fix UAF in gsm_cleanup_mux Zhang Shurong <zhang_shurong(a)foxmail.com> staging: ks7010: potential buffer overflow in ks_wlan_set_encode_ext() Larry Finger <Larry.Finger(a)lwfinger.net> staging: r8712: Fix memory leak in _r8712_init_xmit_priv() Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Documentation: security-bugs.rst: clarify CVE handling Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Documentation: security-bugs.rst: update preferences when dealing with the linux-distros group Dan Carpenter <dan.carpenter(a)linaro.org> Revert "usb: xhci: tegra: Fix error check" Ricardo Ribalda <ribalda(a)chromium.org> usb: xhci-mtk: set the dma max_seg_size Frank Li <Frank.Li(a)nxp.com> usb: cdns3: fix incorrect calculation of ep_buf_size when more than one config Łukasz Bartosik <lb(a)semihalf.com> USB: quirks: add quirk for Focusrite Scarlett Guiting Shen <aarongt.shen(a)gmail.com> usb: ohci-at91: Fix the unhandle interrupt when resume Jisheng Zhang <jszhang(a)kernel.org> usb: dwc3: don't reset device side if dwc3 was configured as host-only Gratian Crisan <gratian.crisan(a)ni.com> usb: dwc3: pci: skip BYT GPIO lookup table for hardwired phy Jakub Vanek <linuxtardis(a)gmail.com> Revert "usb: dwc3: core: Enable AutoRetry feature in the controller" Marc Kleine-Budde <mkl(a)pengutronix.de> can: gs_usb: gs_can_close(): add missing set of CAN state to CAN_STATE_STOPPED Johan Hovold <johan(a)kernel.org> USB: serial: simple: sort driver entries Oliver Neukum <oneukum(a)suse.com> USB: serial: simple: add Kaufmann RKS+CAN VCP Mohsen Tahmasebi <moh53n(a)moh53n.ir> USB: serial: option: add Quectel EC200A module support Jerry Meng <jerry-meng(a)foxmail.com> USB: serial: option: support Quectel EM060K_128 Samuel Holland <samuel.holland(a)sifive.com> serial: sifive: Fix sifive_serial_console_setup() section Ruihong Luo <colorsu1922(a)gmail.com> serial: 8250_dw: Preserve original value of DLF register Johan Hovold <johan+linaro(a)kernel.org> serial: qcom-geni: drop bogus runtime pm state update Sean Christopherson <seanjc(a)google.com> KVM: VMX: Don't fudge CR0 and CR4 for restricted L2 guest Sean Christopherson <seanjc(a)google.com> KVM: Grab a reference to KVM for VM and vCPU stats file descriptors Zqiang <qiang.zhang1211(a)gmail.com> USB: gadget: Fix the memory leak in raw_gadget driver Frank Li <Frank.Li(a)nxp.com> usb: gadget: call usb_gadget_check_config() to verify UDC capability Dan Carpenter <dan.carpenter(a)linaro.org> Revert "usb: gadget: tegra-xudc: Fix error check in tegra_xudc_powerdomain_init()" Zheng Yejian <zhengyejian1(a)huawei.com> tracing: Fix warning in trace_buffered_event_disable() Zheng Yejian <zhengyejian1(a)huawei.com> ring-buffer: Fix wrong stat of cpu_buffer->read Arnd Bergmann <arnd(a)arndb.de> ata: pata_ns87415: mark ns87560_tf_read static Sindhu Devale <sindhu.devale(a)intel.com> RDMA/irdma: Report correct WC error Mario Limonciello <mario.limonciello(a)amd.com> drm/amd: Fix an error handling mistake in psp_sw_init() Yu Kuai <yukuai3(a)huawei.com> dm raid: protect md_stop() with 'reconfig_mutex' Yu Kuai <yukuai3(a)huawei.com> dm raid: clean up four equivalent goto tags in raid_ctr() Yu Kuai <yukuai3(a)huawei.com> dm raid: fix missing reconfig_mutex unlock in raid_ctr() error paths Bart Van Assche <bvanassche(a)acm.org> block: Fix a source code comment in include/uapi/linux/blkzoned.h Matus Gajdos <matuszpd(a)gmail.com> ASoC: fsl_spdif: Silence output on stop Gaosheng Cui <cuigaosheng1(a)huawei.com> drm/msm: Fix IS_ERR_OR_NULL() vs NULL check in a5xx_submit_in_rb() Kashyap Desai <kashyap.desai(a)broadcom.com> RDMA/bnxt_re: Prevent handling any completions after qp destroy Thomas Bogendoerfer <tbogendoerfer(a)suse.de> RDMA/mthca: Fix crash when polling CQ for shared QPs Shiraz Saleem <shiraz.saleem(a)intel.com> RDMA/irdma: Fix data race on CQP request done Shiraz Saleem <shiraz.saleem(a)intel.com> RDMA/irdma: Fix data race on CQP completion stats Shiraz Saleem <shiraz.saleem(a)intel.com> RDMA/irdma: Add missing read barriers Rob Clark <robdclark(a)chromium.org> drm/msm/adreno: Fix snapshot BINDLESS_DATA size Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org> drm/msm/dpu: drop enum dpu_core_perf_data_bus_id Dan Carpenter <dan.carpenter(a)linaro.org> RDMA/mlx4: Make check for invalid flags stricter Fedor Pchelkin <pchelkin(a)ispras.ru> tipc: stop tipc crypto on failure in tipc_node_create Yuanjun Gong <ruc_gongyuanjun(a)163.com> tipc: check return value of pskb_trim() Yuanjun Gong <ruc_gongyuanjun(a)163.com> benet: fix return value check in be_lancer_xmit_workarounds() Lin Ma <linma(a)zju.edu.cn> net/sched: mqprio: Add length check for TCA_MQPRIO_{MAX/MIN}_RATE64 Vladimir Oltean <vladimir.oltean(a)nxp.com> net/sched: mqprio: add extack to mqprio_parse_nlattr() Vladimir Oltean <vladimir.oltean(a)nxp.com> net/sched: mqprio: refactor nlattr parsing to a separate function Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: disallow rule addition to bound chain via NFTA_RULE_CHAIN_ID Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: skip immediate deactivate in _PREPARE_ERROR Florian Westphal <fw(a)strlen.de> netfilter: nft_set_rbtree: fix overlap expiration walk Muhammad Husaini Zulkifli <muhammad.husaini.zulkifli(a)intel.com> igc: Fix Kernel Panic during ndo_tx_timeout callback Maxim Mikityanskiy <maxtram95(a)gmail.com> platform/x86: msi-laptop: Fix rfkill out-of-sync on MSI Wind U100 Vincent Whitchurch <vincent.whitchurch(a)axis.com> net: stmmac: Apply redundant write work around on 4.xx too Hangbin Liu <liuhangbin(a)gmail.com> team: reset team's flags when down link is P2P device Hangbin Liu <liuhangbin(a)gmail.com> bonding: reset bond's flags when down link is P2P device Jedrzej Jagielski <jedrzej.jagielski(a)intel.com> ice: Fix memory management in ice_ethtool_fdir.c Stewart Smith <trawets(a)amazon.com> tcp: Reduce chance of collisions in inet6_hashfn(). Maciej Żenczykowski <maze(a)google.com> ipv6 addrconf: fix bug where deleting a mngtmpaddr can create a new temporary address Yuanjun Gong <ruc_gongyuanjun(a)163.com> ethernet: atheros: fix return value check in atl1e_tso_csum() Harshit Mogalapalli <harshit.m.mogalapalli(a)oracle.com> phy: hisilicon: Fix an out of bounds check in hisi_inno_phy_probe() Jiri Benc <jbenc(a)redhat.com> vxlan: calculate correct header length for GPE Roopa Prabhu <roopa(a)nvidia.com> vxlan: move to its own directory Jijie Shao <shaojijie(a)huawei.com> net: hns3: fix wrong bw weight of disabled tc issue Jijie Shao <shaojijie(a)huawei.com> net: hns3: fix wrong tc bandwidth weight data issue Jiawen Wu <jiawenwu(a)trustnetic.com> net: phy: marvell10g: fix 88x3310 power up Jacob Keller <jacob.e.keller(a)intel.com> iavf: check for removal state before IAVF_FLAG_PF_COMMS_FAILED Jacob Keller <jacob.e.keller(a)intel.com> iavf: fix potential deadlock on allocation failure Wang Ming <machel(a)vivo.com> i40e: Fix an NULL vs IS_ERR() bug for debugfs_create_dir() Sakari Ailus <sakari.ailus(a)linux.intel.com> media: staging: atomisp: select V4L2_FWNODE Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> soundwire: qcom: update status correctly with mask Adrien Thierry <athierry(a)redhat.com> phy: qcom-snps-femto-v2: properly enable ref clock Adrien Thierry <athierry(a)redhat.com> phy: qcom-snps-femto-v2: keep cfg_ahb_clk enabled during runtime suspend Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> phy: qcom-snps: correct struct qcom_snps_hsphy kerneldoc Yuan Can <yuancan(a)huawei.com> phy: qcom-snps: Use dev_err_probe() to simplify code Zhang Yi <yi.zhang(a)huawei.com> jbd2: fix a race when checking checkpoint buffer busy Zhang Yi <yi.zhang(a)huawei.com> jbd2: remove journal_clean_one_cp_list() Zhang Yi <yi.zhang(a)huawei.com> jbd2: remove t_checkpoint_io_list Guchun Chen <guchun.chen(a)amd.com> drm/amdgpu/vkms: relax timer deactivation by hrtimer_try_to_cancel Flora Cui <flora.cui(a)amd.com> drm/amdgpu: fix vkms crtc settings Quinn Tran <qutran(a)marvell.com> scsi: qla2xxx: Fix hang in task management Arun Easi <aeasi(a)marvell.com> scsi: qla2xxx: Add debug prints in the device remove path Quinn Tran <qutran(a)marvell.com> scsi: qla2xxx: Fix task management cmd fail due to unavailable resource Quinn Tran <qutran(a)marvell.com> scsi: qla2xxx: Fix task management cmd failure Quinn Tran <qutran(a)marvell.com> scsi: qla2xxx: Multi-que support for TMF Gaosheng Cui <cuigaosheng1(a)huawei.com> scsi: qla2xxx: Remove unused declarations for qla2xxx Masami Hiramatsu (Google) <mhiramat(a)kernel.org> tracing/probes: Fix to record 0-length data_loc in fetch_store_string*() if fails Masami Hiramatsu (Google) <mhiramat(a)kernel.org> Revert "tracing: Add "(fault)" name injection to kernel probes" Steven Rostedt (Google) <rostedt(a)goodmis.org> tracing: Allow synthetic events to pass around stacktraces Masami Hiramatsu (Google) <mhiramat(a)kernel.org> tracing/probes: Fix to avoid double count of the string length on the array Masami Hiramatsu (Google) <mhiramat(a)kernel.org> tracing/probes: Add symstr type for dynamic events Heiner Kallweit <hkallweit1(a)gmail.com> pwm: meson: fix handling of period/duty if greater than UINT_MAX Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> pwm: meson: Simplify duplicated per-channel tracking Bharath SM <bharathsm(a)microsoft.com> cifs: if deferred close is disabled then close files immediately Namjae Jeon <linkinjeon(a)kernel.org> ksmbd: remove internal.h include Paulo Alcantara <pc(a)cjr.nz> cifs: use fs_context for automounts Steve French <stfrench(a)microsoft.com> cifs: missing directory in MAINTAINERS file Christian König <christian.koenig(a)amd.com> drm/ttm: never consider pinned BOs for eviction&swap Hui Li <caelli(a)tencent.com> tty: fix hang on tty device with no_room set Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com> n_tty: Rename tail to old_tail in n_tty_read() Thomas Hellström <thomas.hellstrom(a)linux.intel.com> drm/ttm: Don't leak a resource on eviction error Thomas Hellström <thomas.hellstrom(a)linux.intel.com> drm/ttm: Don't print error message if eviction was interrupted Alexander Aring <aahringo(a)redhat.com> fs: dlm: interrupt posix locks only when process is killed Alexander Aring <aahringo(a)redhat.com> dlm: rearrange async condition return Alexander Aring <aahringo(a)redhat.com> dlm: cleanup plock_op vs plock_xop Rick Wertenbroek <rick.wertenbroek(a)gmail.com> PCI: rockchip: Don't advertise MSI-X in PCIe capabilities Rick Wertenbroek <rick.wertenbroek(a)gmail.com> PCI: rockchip: Fix window mapping and address translation for endpoint Rick Wertenbroek <rick.wertenbroek(a)gmail.com> PCI: rockchip: Remove writes to unused registers Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com> PCI/ASPM: Avoid link retraining race Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com> PCI/ASPM: Factor out pcie_wait_for_retrain() Bjorn Helgaas <bhelgaas(a)google.com> PCI/ASPM: Return 0 or -ETIMEDOUT from pcie_retrain_link() Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> i2c: nomadik: Remove a useless call in the remove function Andi Shyti <andi.shyti(a)kernel.org> i2c: nomadik: Use devm_clk_get_enabled() Andi Shyti <andi.shyti(a)kernel.org> i2c: nomadik: Remove unnecessary goto label Markus Elfring <elfring(a)users.sourceforge.net> i2c: Improve size determinations Markus Elfring <elfring(a)users.sourceforge.net> i2c: Delete error messages for failed memory allocations Filipe Manana <fdmanana(a)suse.com> btrfs: fix race between quota disable and relocation Bartosz Golaszewski <bartosz.golaszewski(a)linaro.org> gpio: mvebu: fix irq domain leak Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> gpio: mvebu: Make use of devm_pwmchip_add Hans de Goede <hdegoede(a)redhat.com> gpio: tps68470: Make tps68470_gpio_output() always set the initial value Ondrej Mosnacek <omosnace(a)redhat.com> io_uring: don't audit the capability check in io_uring_create() Claudio Imbrenda <imbrenda(a)linux.ibm.com> KVM: s390: pv: fix index value of replaced ASCE Zhihao Cheng <chengzhihao1(a)huawei.com> jbd2: Fix wrongly judgement for buffer head removing while doing checkpoint ------------- Diffstat: Documentation/admin-guide/security-bugs.rst | 37 ++- Documentation/trace/kprobetrace.rst | 8 +- MAINTAINERS | 1 + Makefile | 4 +- arch/s390/mm/gmap.c | 1 + arch/x86/include/asm/kvm-x86-ops.h | 1 + arch/x86/include/asm/kvm_host.h | 3 +- arch/x86/kvm/svm/svm.c | 6 + arch/x86/kvm/vmx/vmx.c | 41 +++- arch/x86/kvm/x86.c | 34 ++- drivers/acpi/processor_perflib.c | 42 +++- drivers/ata/pata_ns87415.c | 2 +- drivers/block/rbd.c | 124 +++++++--- drivers/char/tpm/tpm_tis_core.c | 10 +- drivers/cpufreq/intel_pstate.c | 14 -- drivers/gpio/gpio-mvebu.c | 26 ++- drivers/gpio/gpio-tps68470.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 45 ++-- drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.h | 5 +- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 2 +- drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h | 2 +- drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.h | 13 -- drivers/gpu/drm/ttm/ttm_bo.c | 25 +- drivers/hwmon/k10temp.c | 17 +- drivers/hwmon/nct7802.c | 2 +- drivers/i2c/busses/i2c-ibm_iic.c | 4 +- drivers/i2c/busses/i2c-nomadik.c | 42 +--- drivers/i2c/busses/i2c-sh7760.c | 3 +- drivers/i2c/busses/i2c-tiny-usb.c | 4 +- drivers/infiniband/hw/bnxt_re/ib_verbs.c | 12 + drivers/infiniband/hw/bnxt_re/qplib_fp.c | 18 ++ drivers/infiniband/hw/bnxt_re/qplib_fp.h | 1 + drivers/infiniband/hw/irdma/ctrl.c | 31 ++- drivers/infiniband/hw/irdma/defs.h | 46 ++-- drivers/infiniband/hw/irdma/hw.c | 3 +- drivers/infiniband/hw/irdma/main.h | 2 +- drivers/infiniband/hw/irdma/puda.c | 6 + drivers/infiniband/hw/irdma/type.h | 2 + drivers/infiniband/hw/irdma/uk.c | 3 + drivers/infiniband/hw/irdma/utils.c | 8 +- drivers/infiniband/hw/mlx4/qp.c | 18 +- drivers/infiniband/hw/mthca/mthca_qp.c | 2 +- drivers/irqchip/irq-bcm6345-l1.c | 14 +- drivers/irqchip/irq-gic-v3-its.c | 75 +++--- drivers/md/dm-cache-policy-smq.c | 28 ++- drivers/md/dm-raid.c | 20 +- drivers/md/md.c | 2 + drivers/net/Makefile | 2 +- drivers/net/bonding/bond_main.c | 5 + drivers/net/can/usb/gs_usb.c | 2 + drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 7 +- drivers/net/ethernet/emulex/benet/be_main.c | 3 +- .../net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c | 17 +- .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 3 +- .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 3 +- drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 2 +- drivers/net/ethernet/intel/iavf/iavf_main.c | 11 +- drivers/net/ethernet/intel/ice/ice_ethtool_fdir.c | 26 ++- drivers/net/ethernet/intel/igc/igc_main.c | 40 +++- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 +- drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c | 4 +- drivers/net/phy/marvell10g.c | 7 + drivers/net/team/team.c | 9 + drivers/net/virtio_net.c | 4 +- drivers/net/vxlan/Makefile | 7 + drivers/net/{vxlan.c => vxlan/vxlan_core.c} | 23 +- drivers/pci/controller/pcie-rockchip-ep.c | 156 ++++++------- drivers/pci/controller/pcie-rockchip.h | 40 ++-- drivers/pci/pcie/aspm.c | 55 +++-- drivers/phy/hisilicon/phy-hisi-inno-usb2.c | 2 +- drivers/phy/qualcomm/phy-qcom-snps-femto-v2.c | 86 ++++--- drivers/platform/x86/msi-laptop.c | 8 +- drivers/pwm/pwm-meson.c | 25 +- drivers/s390/block/dasd_ioctl.c | 1 + drivers/scsi/qla2xxx/qla_attr.c | 3 + drivers/scsi/qla2xxx/qla_def.h | 27 +++ drivers/scsi/qla2xxx/qla_gbl.h | 14 +- drivers/scsi/qla2xxx/qla_init.c | 256 +++++++++++++++++++-- drivers/scsi/qla2xxx/qla_iocb.c | 33 ++- drivers/scsi/qla2xxx/qla_isr.c | 26 ++- drivers/scsi/qla2xxx/qla_target.h | 2 - drivers/soundwire/qcom.c | 2 +- drivers/staging/ks7010/ks_wlan_net.c | 6 +- drivers/staging/media/atomisp/Kconfig | 1 + drivers/staging/rtl8712/rtl871x_xmit.c | 43 +++- drivers/staging/rtl8712/xmit_linux.c | 6 + drivers/tty/n_gsm.c | 4 +- drivers/tty/n_tty.c | 29 ++- drivers/tty/serial/8250/8250_dwlib.c | 6 +- drivers/tty/serial/qcom_geni_serial.c | 7 - drivers/tty/serial/sifive.c | 2 +- drivers/usb/cdns3/cdns3-gadget.c | 4 +- drivers/usb/core/quirks.c | 4 + drivers/usb/dwc3/core.c | 20 +- drivers/usb/dwc3/core.h | 3 - drivers/usb/dwc3/dwc3-pci.c | 6 +- drivers/usb/gadget/composite.c | 4 + drivers/usb/gadget/legacy/raw_gadget.c | 12 +- drivers/usb/gadget/udc/tegra-xudc.c | 8 +- drivers/usb/host/ohci-at91.c | 8 +- drivers/usb/host/xhci-mtk.c | 1 + drivers/usb/host/xhci-pci.c | 4 +- drivers/usb/host/xhci-ring.c | 25 +- drivers/usb/host/xhci-tegra.c | 8 +- drivers/usb/serial/option.c | 6 + drivers/usb/serial/usb-serial-simple.c | 73 +++--- fs/btrfs/qgroup.c | 18 +- fs/btrfs/transaction.c | 10 +- fs/ceph/metric.c | 2 +- fs/cifs/cifs_dfs_ref.c | 100 ++++---- fs/cifs/file.c | 4 +- fs/dlm/plock.c | 100 ++++---- fs/file.c | 6 +- fs/internal.h | 2 - fs/jbd2/checkpoint.c | 197 ++++++---------- fs/jbd2/commit.c | 3 +- fs/jbd2/transaction.c | 17 +- fs/ksmbd/vfs.c | 2 - fs/nfsd/nfs4state.c | 2 - include/linux/jbd2.h | 7 +- include/linux/namei.h | 2 + include/net/ipv6.h | 8 +- include/net/vxlan.h | 13 +- include/trace/events/jbd2.h | 12 +- include/uapi/linux/blkzoned.h | 10 +- io_uring/io_uring.c | 10 +- kernel/locking/rtmutex.c | 172 +++++++++----- kernel/locking/rtmutex_api.c | 2 +- kernel/locking/rtmutex_common.h | 47 ++-- kernel/locking/ww_mutex.h | 12 +- kernel/trace/ring_buffer.c | 22 +- kernel/trace/trace.c | 2 +- kernel/trace/trace.h | 6 + kernel/trace/trace_events.c | 14 +- kernel/trace/trace_events_hist.c | 7 +- kernel/trace/trace_events_synth.c | 80 ++++++- kernel/trace/trace_probe.c | 46 ++-- kernel/trace/trace_probe.h | 16 +- kernel/trace/trace_probe_kernel.h | 30 +-- kernel/trace/trace_probe_tmpl.h | 59 ++++- kernel/trace/trace_synth.h | 1 + kernel/trace/trace_uprobe.c | 3 +- net/ceph/messenger.c | 1 + net/ipv6/addrconf.c | 14 +- net/netfilter/nf_tables_api.c | 5 +- net/netfilter/nft_immediate.c | 27 ++- net/netfilter/nft_set_rbtree.c | 20 +- net/sched/sch_mqprio.c | 144 ++++++++---- net/tipc/crypto.c | 3 +- net/tipc/node.c | 2 +- sound/pci/hda/patch_realtek.c | 1 + sound/soc/codecs/cs42l51-i2c.c | 6 + sound/soc/codecs/cs42l51.c | 7 - sound/soc/codecs/cs42l51.h | 1 - sound/soc/codecs/wm8904.c | 3 + sound/soc/fsl/fsl_spdif.c | 2 + tools/testing/selftests/net/mptcp/mptcp_join.sh | 5 +- tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 20 +- virt/kvm/kvm_main.c | 24 ++ 160 files changed, 2097 insertions(+), 1256 deletions(-)

1 year, 5 months

8
162
0 0

Re: [EXTERNAL] Re: [PATCH V7 net] net: mana: Fix MANA VF unload when hardware is

by Souradeep Chakrabarti

On Wed, Aug 02, 2023 at 10:57:52AM +0530, Kalesh Anakkur Purayil wrote: > Hi Souradeep, > > It looks like the subject line is not complete. I could see "net: mana: Fix > MANA VF unload when hardware is". > > Is that correct? > > Regards, > Kalesh > Yes, it got truncated. Will fix it in next version. > On Wed, Aug 2, 2023 at 12:29 AM Souradeep Chakrabarti < > schakrabarti(a)microsoft.com> wrote: > > > > > > > >-----Original Message----- > > >From: Simon Horman <horms(a)kernel.org> > > >Sent: Tuesday, August 1, 2023 9:01 PM > > >To: Souradeep Chakrabarti <schakrabarti(a)linux.microsoft.com> > > >Cc: KY Srinivasan <kys(a)microsoft.com>; Haiyang Zhang > > ><haiyangz(a)microsoft.com>; wei.liu(a)kernel.org; Dexuan Cui > > ><decui(a)microsoft.com>; davem(a)davemloft.net; edumazet(a)google.com; > > >kuba(a)kernel.org; pabeni(a)redhat.com; Long Li <longli(a)microsoft.com>; Ajay > > >Sharma <sharmaajay(a)microsoft.com>; leon(a)kernel.org; > > >cai.huoqing(a)linux.dev; ssengar(a)linux.microsoft.com; vkuznets > > ><vkuznets(a)redhat.com>; tglx(a)linutronix.de; linux-hyperv(a)vger.kernel.org; > > >netdev(a)vger.kernel.org; linux-kernel(a)vger.kernel.org; linux- > > >rdma(a)vger.kernel.org; Souradeep Chakrabarti > > ><schakrabarti(a)microsoft.com>; stable(a)vger.kernel.org > > >Subject: [EXTERNAL] Re: [PATCH V7 net] net: mana: Fix MANA VF unload when > > >hardware is > > > > > >On Tue, Aug 01, 2023 at 05:29:13AM -0700, Souradeep Chakrabarti wrote: > > > > > >... > > > > > >Hi Souradeep, > > > > > > > > >> + for (i = 0; i < apc->num_queues; i++) { > > >> + txq = &apc->tx_qp[i].txq; > > >> + while (skb = skb_dequeue(&txq->pending_skbs)) { > > > > > >W=1 builds with both clang-16 and gcc-12 complain that they would like an > > >extra set of parentheses around an assignment used as a truth value. > > Thanks for letting me know. I will fix it in next version. > > > > > >> + mana_unmap_skb(skb, apc); > > >> + dev_consume_skb_any(skb); > > >> + } > > >> + atomic_set(&txq->pending_sends, 0); > > >> + } > > >> /* We're 100% sure the queues can no longer be woken up, because > > >> * we're sure now mana_poll_tx_cq() can't be running. > > >> */ > > >> -- > > >> 2.34.1 > > >> > > >> > > > > > > -- > Regards, > Kalesh A P

1 year, 5 months

1
0
0 0

[PATCH v2 1/1] test_firmware: fix the memory leaks with the reqs buffer

by Mirsad Todorovac

[ commit be37bed754ed90b2655382f93f9724b3c1aae847 upstream ] Dan Carpenter spotted that test_fw_config->reqs will be leaked if trigger_batched_requests_store() is called two or more times. The same appears with trigger_batched_requests_async_store(). This bug wasn't triggered by the tests, but observed by Dan's visual inspection of the code. The recommended workaround was to return -EBUSY if test_fw_config->reqs is already allocated. Fixes: c92316bf8e94 ("test_firmware: add batched firmware tests") Cc: Luis Chamberlain <mcgrof(a)kernel.org> Cc: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Cc: Russ Weight <russell.h.weight(a)intel.com> Cc: Tianfei Zhang <tianfei.zhang(a)intel.com> Cc: Shuah Khan <shuah(a)kernel.org> Cc: Colin Ian King <colin.i.king(a)gmail.com> Cc: Randy Dunlap <rdunlap(a)infradead.org> Cc: linux-kselftest(a)vger.kernel.org Cc: stable(a)vger.kernel.org # v4.14 Suggested-by: Dan Carpenter <error27(a)gmail.com> Suggested-by: Takashi Iwai <tiwai(a)suse.de> Link: https://lore.kernel.org/r/20230509084746.48259-2-mirsad.todorovac@alu.unizg… Signed-off-by: Mirsad Todorovac <mirsad.todorovac(a)alu.unizg.hr> [ This fix is applied against the 4.14 stable branch. There are no changes to the ] [ fix in code when compared to the upstread, only the reformatting for backport. ] Signed-off-by: Mirsad Todorovac <mirsad.todorovac(a)alu.unizg.hr> --- v1 -> v2: removed the Reviewed-by: and Acked-by tags, as this is a slightly different patch and those need to be reacquired lib/test_firmware.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lib/test_firmware.c b/lib/test_firmware.c index 1c5e5246bf10..5318c5e18acf 100644 --- a/lib/test_firmware.c +++ b/lib/test_firmware.c @@ -621,6 +621,11 @@ static ssize_t trigger_batched_requests_store(struct device *dev, mutex_lock(&test_fw_mutex); + if (test_fw_config->reqs) { + rc = -EBUSY; + goto out_bail; + } + test_fw_config->reqs = vzalloc(sizeof(struct test_batched_req) * test_fw_config->num_requests * 2); if (!test_fw_config->reqs) { @@ -723,6 +728,11 @@ ssize_t trigger_batched_requests_async_store(struct device *dev, mutex_lock(&test_fw_mutex); + if (test_fw_config->reqs) { + rc = -EBUSY; + goto out_bail; + } + test_fw_config->reqs = vzalloc(sizeof(struct test_batched_req) * test_fw_config->num_requests * 2); if (!test_fw_config->reqs) { -- 2.34.1

1 year, 5 months

1
0
0 0

[PATCH] fsverity: skip PKCS#7 parser when keyring is empty

by Eric Biggers

From: Eric Biggers <ebiggers(a)google.com> If an fsverity builtin signature is given for a file but the ".fs-verity" keyring is empty, there's no real reason to run the PKCS#7 parser. Skip this to avoid the PKCS#7 attack surface when builtin signature support is configured into the kernel but is not being used. This is a hardening improvement, not a fix per se, but I've added Fixes and Cc stable to get it out to more users. Fixes: 432434c9f8e1 ("fs-verity: support builtin file signatures") Cc: stable(a)vger.kernel.org Signed-off-by: Eric Biggers <ebiggers(a)google.com> --- fs/verity/signature.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/fs/verity/signature.c b/fs/verity/signature.c index b95acae64eac6..f6668d92d8151 100644 --- a/fs/verity/signature.c +++ b/fs/verity/signature.c @@ -70,10 +70,26 @@ int fsverity_verify_signature(const struct fsverity_info *vi, d->digest_size = cpu_to_le16(hash_alg->digest_size); memcpy(d->digest, vi->file_digest, hash_alg->digest_size); - err = verify_pkcs7_signature(d, sizeof(*d) + hash_alg->digest_size, - signature, sig_size, fsverity_keyring, - VERIFYING_UNSPECIFIED_SIGNATURE, - NULL, NULL); + if (fsverity_keyring->keys.nr_leaves_on_tree == 0) { + /* + * The ".fs-verity" keyring is empty, due to builtin signatures + * being supported by the kernel but not actually being used. + * In this case, verify_pkcs7_signature() would always return an + * error, usually ENOKEY. It could also be EBADMSG if the + * PKCS#7 is malformed, but that isn't very important to + * distinguish. So, just skip to ENOKEY to avoid the attack + * surface of the PKCS#7 parser, which would otherwise be + * reachable by any task able to execute FS_IOC_ENABLE_VERITY. + */ + err = -ENOKEY; + } else { + err = verify_pkcs7_signature(d, + sizeof(*d) + hash_alg->digest_size, + signature, sig_size, + fsverity_keyring, + VERIFYING_UNSPECIFIED_SIGNATURE, + NULL, NULL); + } kfree(d); if (err) { base-commit: 456ae5fe9b448f44ebe98b391a3bae9c75df465e -- 2.41.0

1 year, 5 months

3
3
0 0

[PATCH] tpm: Disable RNG for all AMD fTPMs

by Mario Limonciello

The TPM RNG functionality is not necessary for entropy when the CPU already supports the RDRAND instruction. The TPM RNG functionality was previously disabled on a subset of AMD fTPM series, but reports continue to show problems on some systems causing stutter root caused to TPM RNG functionality. Expand disabling TPM RNG use for all AMD fTPMs whether they have versions that claim to have fixed or not. To accomplish this, move the detection into part of the TPM CRB registration and add a flag indicating that the TPM should opt-out of registration to hwrng. Cc: stable(a)vger.kernel.org # 6.1.y+ Fixes: b006c439d58d ("hwrng: core - start hwrng kthread also for untrusted sources") Fixes: f1324bbc4011 ("tpm: disable hwrng for fTPM on some AMD designs") Reported-by: daniil.stas(a)posteo.net Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217719 Reported-by: bitlord0xff(a)gmail.com Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217212 Signed-off-by: Mario Limonciello <mario.limonciello(a)amd.com> --- drivers/char/tpm/tpm-chip.c | 80 +++++++------------------------------ drivers/char/tpm/tpm_crb.c | 23 +++++++++++ include/linux/tpm.h | 7 ++++ 3 files changed, 44 insertions(+), 66 deletions(-) diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c index cf5499e51999b..3154a5ef2611f 100644 --- a/drivers/char/tpm/tpm-chip.c +++ b/drivers/char/tpm/tpm-chip.c @@ -89,6 +89,14 @@ static void tpm_clk_disable(struct tpm_chip *chip) chip->ops->clk_enable(chip, false); } +static int tpm_check_flags(struct tpm_chip *chip) +{ + if (!chip->ops->check_flags) + return 0; + + return chip->ops->check_flags(chip); +} + /** * tpm_chip_start() - power on the TPM * @chip: a TPM chip to use @@ -510,70 +518,6 @@ static int tpm_add_legacy_sysfs(struct tpm_chip *chip) return 0; } -/* - * Some AMD fTPM versions may cause stutter - * https://www.amd.com/en/support/kb/faq/pa-410 - * - * Fixes are available in two series of fTPM firmware: - * 6.x.y.z series: 6.0.18.6 + - * 3.x.y.z series: 3.57.y.5 + - */ -#ifdef CONFIG_X86 -static bool tpm_amd_is_rng_defective(struct tpm_chip *chip) -{ - u32 val1, val2; - u64 version; - int ret; - - if (!(chip->flags & TPM_CHIP_FLAG_TPM2)) - return false; - - ret = tpm_request_locality(chip); - if (ret) - return false; - - ret = tpm2_get_tpm_pt(chip, TPM2_PT_MANUFACTURER, &val1, NULL); - if (ret) - goto release; - if (val1 != 0x414D4400U /* AMD */) { - ret = -ENODEV; - goto release; - } - ret = tpm2_get_tpm_pt(chip, TPM2_PT_FIRMWARE_VERSION_1, &val1, NULL); - if (ret) - goto release; - ret = tpm2_get_tpm_pt(chip, TPM2_PT_FIRMWARE_VERSION_2, &val2, NULL); - -release: - tpm_relinquish_locality(chip); - - if (ret) - return false; - - version = ((u64)val1 << 32) | val2; - if ((version >> 48) == 6) { - if (version >= 0x0006000000180006ULL) - return false; - } else if ((version >> 48) == 3) { - if (version >= 0x0003005700000005ULL) - return false; - } else { - return false; - } - - dev_warn(&chip->dev, - "AMD fTPM version 0x%llx causes system stutter; hwrng disabled\n", - version); - - return true; -} -#else -static inline bool tpm_amd_is_rng_defective(struct tpm_chip *chip) -{ - return false; -} -#endif /* CONFIG_X86 */ - static int tpm_hwrng_read(struct hwrng *rng, void *data, size_t max, bool wait) { struct tpm_chip *chip = container_of(rng, struct tpm_chip, hwrng); @@ -588,7 +532,7 @@ static int tpm_hwrng_read(struct hwrng *rng, void *data, size_t max, bool wait) static int tpm_add_hwrng(struct tpm_chip *chip) { if (!IS_ENABLED(CONFIG_HW_RANDOM_TPM) || tpm_is_firmware_upgrade(chip) || - tpm_amd_is_rng_defective(chip)) + tpm_is_rng_disabled(chip)) return 0; snprintf(chip->hwrng_name, sizeof(chip->hwrng_name), @@ -670,6 +614,10 @@ int tpm_chip_register(struct tpm_chip *chip) if (rc) return rc; + rc = tpm_check_flags(chip); + if (rc) + return rc; + tpm_sysfs_add_device(chip); tpm_bios_log_setup(chip); @@ -719,7 +667,7 @@ void tpm_chip_unregister(struct tpm_chip *chip) { tpm_del_legacy_sysfs(chip); if (IS_ENABLED(CONFIG_HW_RANDOM_TPM) && !tpm_is_firmware_upgrade(chip) && - !tpm_amd_is_rng_defective(chip)) + !tpm_is_rng_disabled(chip)) hwrng_unregister(&chip->hwrng); tpm_bios_log_teardown(chip); if (chip->flags & TPM_CHIP_FLAG_TPM2 && !tpm_is_firmware_upgrade(chip)) diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c index 1a5d09b185134..5614b68ef1905 100644 --- a/drivers/char/tpm/tpm_crb.c +++ b/drivers/char/tpm/tpm_crb.c @@ -463,6 +463,28 @@ static bool crb_req_canceled(struct tpm_chip *chip, u8 status) return (cancel & CRB_CANCEL_INVOKE) == CRB_CANCEL_INVOKE; } +static int crb_check_flags(struct tpm_chip *chip) +{ + u32 val; + int ret; + + ret = crb_request_locality(chip, 0); + if (ret) + return ret; + + ret = tpm2_get_tpm_pt(chip, TPM2_PT_MANUFACTURER, &val, NULL); + if (ret) + goto release; + + if (val == 0x414D4400U /* AMD */) + chip->flags |= TPM_CHIP_FLAG_HWRNG_DISABLED; + +release: + crb_relinquish_locality(chip, 0); + + return ret; +} + static const struct tpm_class_ops tpm_crb = { .flags = TPM_OPS_AUTO_STARTUP, .status = crb_status, @@ -476,6 +498,7 @@ static const struct tpm_class_ops tpm_crb = { .relinquish_locality = crb_relinquish_locality, .req_complete_mask = CRB_DRV_STS_COMPLETE, .req_complete_val = CRB_DRV_STS_COMPLETE, + .check_flags = crb_check_flags, }; static int crb_check_resource(struct acpi_resource *ares, void *data) diff --git a/include/linux/tpm.h b/include/linux/tpm.h index 6a1e8f1572551..aeb84944b0ca4 100644 --- a/include/linux/tpm.h +++ b/include/linux/tpm.h @@ -82,6 +82,7 @@ struct tpm_class_ops { int (*request_locality)(struct tpm_chip *chip, int loc); int (*relinquish_locality)(struct tpm_chip *chip, int loc); void (*clk_enable)(struct tpm_chip *chip, bool value); + int (*check_flags)(struct tpm_chip *chip); }; #define TPM_NUM_EVENT_LOG_FILES 3 @@ -283,6 +284,7 @@ enum tpm_chip_flags { TPM_CHIP_FLAG_FIRMWARE_POWER_MANAGED = BIT(6), TPM_CHIP_FLAG_FIRMWARE_UPGRADE = BIT(7), TPM_CHIP_FLAG_SUSPENDED = BIT(8), + TPM_CHIP_FLAG_HWRNG_DISABLED = BIT(9), }; #define to_tpm_chip(d) container_of(d, struct tpm_chip, dev) @@ -417,6 +419,11 @@ static inline u32 tpm2_rc_value(u32 rc) return (rc & BIT(7)) ? rc & 0xff : rc; } +static inline bool tpm_is_rng_disabled(struct tpm_chip *chip) +{ + return chip->flags & TPM_CHIP_FLAG_HWRNG_DISABLED; +} + #if defined(CONFIG_TCG_TPM) || defined(CONFIG_TCG_TPM_MODULE) extern int tpm_is_tpm2(struct tpm_chip *chip); -- 2.34.1

1 year, 5 months

2
1
0 0

[PATCH 0/6] make vma locking more obvious

by Suren Baghdasaryan

During recent vma locking patch reviews Linus and Jann Horn noted a number of issues with vma locking and suggested improvements: 1. walk_page_range() does not have ability to write-lock a vma during the walk when it's done under mmap_write_lock. For example s390_reset_cmma(). 2. Vma locking is hidden inside vm_flags modifiers and is hard to follow. Suggestion is to change vm_flags_reset{_once} to assert that vma is write-locked and require an explicit locking. 3. Same issue with vma_prepare() hiding vma locking. 4. In userfaultfd vm_flags are modified after vma->vm_userfaultfd_ctx and page faults can operate on a context while it's changed. 5. do_brk_flags() and __install_special_mapping() not locking a newly created vma before adding it into the mm. While not strictly a problem, this is fragile if vma is modified after insertion, as in the mmap_region() case which was recently fixed. Suggestion is to always lock a new vma before inserting it and making it visible to page faults. 6. vma_assert_write_locked() for CONFIG_PER_VMA_LOCK=n would benefit from being mmap_assert_write_locked() instead of no-op and then any place which operates on a vma and calls mmap_assert_write_locked() can be converted into vma_assert_write_locked(). I CC'ed stable only on the first patch because others are cleanups and the bug in userfaultfd does not affect stable (lock_vma_under_rcu prevents uffds from being handled under vma lock protection). However I would be happy if the whole series is merged into stable 6.4 since it makes vma locking more maintainable. The patches apply cleanly over Linus' ToT and will conflict when applied over mm-unstable due to missing [1]. The conflict can be easily resolved by ignoring conflicting deletions but probably simpler to take [1] into mm-unstable and avoid later conflict. [1] commit 6c21e066f925 ("mm/mempolicy: Take VMA lock before replacing policy") Suren Baghdasaryan (6): mm: enable page walking API to lock vmas during the walk mm: for !CONFIG_PER_VMA_LOCK equate write lock assertion for vma and mmap mm: replace mmap with vma write lock assertions when operating on a vma mm: lock vma explicitly before doing vm_flags_reset and vm_flags_reset_once mm: always lock new vma before inserting into vma tree mm: move vma locking out of vma_prepare arch/powerpc/kvm/book3s_hv_uvmem.c | 1 + arch/powerpc/mm/book3s64/subpage_prot.c | 2 +- arch/riscv/mm/pageattr.c | 4 ++-- arch/s390/mm/gmap.c | 10 ++++----- drivers/infiniband/hw/hfi1/file_ops.c | 1 + fs/proc/task_mmu.c | 10 ++++----- fs/userfaultfd.c | 6 +++++ include/linux/mm.h | 13 +++++++---- include/linux/pagewalk.h | 6 ++--- mm/damon/vaddr.c | 4 ++-- mm/hmm.c | 2 +- mm/hugetlb.c | 2 +- mm/khugepaged.c | 5 +++-- mm/ksm.c | 16 +++++++------- mm/madvise.c | 13 +++++------ mm/memcontrol.c | 4 ++-- mm/memory-failure.c | 2 +- mm/memory.c | 2 +- mm/mempolicy.c | 12 ++++------ mm/migrate_device.c | 2 +- mm/mincore.c | 2 +- mm/mlock.c | 5 +++-- mm/mmap.c | 29 ++++++++++++++++--------- mm/mprotect.c | 3 ++- mm/pagewalk.c | 13 ++++++++--- mm/vmscan.c | 3 ++- 26 files changed, 100 insertions(+), 72 deletions(-) -- 2.41.0.487.g6d72f3e995-goog

1 year, 5 months

5
17
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror August 2023