diff mbox series

[5.10,028/199] drm/atomic: put state on error path

Message ID	20210125183217.443948284@linuxfoundation.org
State	Superseded
Headers	show Return-Path: <stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Pan Bian <bianpan2016@163.com>, Daniel Vetter <daniel.vetter@ffwll.ch> Subject: [PATCH 5.10 028/199] drm/atomic: put state on error path Date: Mon, 25 Jan 2021 19:37:30 +0100 Message-Id: <20210125183217.443948284@linuxfoundation.org> In-Reply-To: <20210125183216.245315437@linuxfoundation.org> References: <20210125183216.245315437@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [5.10,002/199] mtd: rawnand: gpmi: fix dst bit offset when extracting raw payload [5.10,003/199] mtd: rawnand: nandsim: Fix the logic when selecting Hamming soft ECC engine [5.10,004/199] i2c: tegra: Wait for config load atomically while in ISR [5.10,005/199] i2c: bpmp-tegra: Ignore unknown I2C_M flags [5.10,006/199] platform/x86: i2c-multi-instantiate: Dont create platform device for INT3515 ACPI ... [5.10,007/199] platform/x86: ideapad-laptop: Disable touchpad_switch for ELAN0634 [5.10,008/199] ALSA: seq: oss: Fix missing error check in snd_seq_oss_synth_make_info() [5.10,009/199] ALSA: hda/realtek - Limit int mic boost on Acer Aspire E5-575T [5.10,010/199] ALSA: hda/via: Add minimum mute flag [5.10,011/199] crypto: xor - Fix divide error in do_xor_speed() [5.10,012/199] dm crypt: fix copy and paste bug in crypt_alloc_req_aead [5.10,013/199] ACPI: scan: Make acpi_bus_get_device() clear return pointer on error [5.10,014/199] btrfs: dont get an EINTR during drop_snapshot for reloc [5.10,016/199] btrfs: fix lockdep splat in btrfs_recover_relocation [5.10,017/199] btrfs: dont clear ret in btrfs_start_dirty_block_groups [5.10,018/199] btrfs: send: fix invalid clone operations when cloning from the same file and root [5.10,019/199] fs: fix lazytime expiration handling in __writeback_single_inode() [5.10,020/199] pinctrl: ingenic: Fix JZ4760 support [5.10,021/199] mmc: core: dont initialize block size from ext_csd if not present [5.10,022/199] mmc: sdhci-of-dwcmshc: fix rpmb access [5.10,023/199] mmc: sdhci-xenon: fix 1.8v regulator stabilization [5.10,024/199] mmc: sdhci-brcmstb: Fix mmc timeout errors on S5 suspend [5.10,025/199] dm: avoid filesystem lookup in dm_get_dev_t() [5.10,026/199] dm integrity: fix a crash if "recalculate" used without "internal_hash" [5.10,027/199] dm integrity: conditionally disable "recalculate" feature [5.10,028/199] drm/atomic: put state on error path [5.10,029/199] drm/syncobj: Fix use-after-free [5.10,030/199] drm/amdgpu: remove gpu info firmware of green sardine [5.10,031/199] drm/amd/display: DCN2X Find Secondary Pipe properly in MPO + ODM Case [5.10,032/199] drm/i915/gt: Prevent use of engine->wa_ctx after error [5.10,033/199] drm/i915: Check for rq->hwsp validity after acquiring RCU lock [5.10,034/199] ASoC: Intel: haswell: Add missing pm_ops [5.10,036/199] SUNRPC: Handle TCP socket sends with kernel_sendpage() again [5.10,037/199] HID: multitouch: Enable multi-input for Synaptics pointstick/touchpad device [5.10,038/199] HID: sony: select CONFIG_CRC32 [5.10,039/199] dm integrity: select CRYPTO_SKCIPHER [5.10,040/199] x86/hyperv: Fix kexec panic/hang issues [5.10,041/199] scsi: ufs: Relax the condition of UFSHCI_QUIRK_SKIP_MANUAL_WB_FLUSH_CTRL [5.10,042/199] scsi: ufs: Correct the LUN used in eh_device_reset_handler() callback [5.10,043/199] scsi: qedi: Correct max length of CHAP secret [5.10,045/199] scsi: sd: Suppress spurious errors when WRITE SAME is being disabled [5.10,046/199] riscv: Fix kernel time_init() [5.10,047/199] riscv: Fix sifive serial driver [5.10,048/199] riscv: Enable interrupts during syscalls with M-Mode [5.10,050/199] HID: Ignore battery for Elan touchscreen on ASUS UX550 [5.10,051/199] clk: tegra30: Add hda clock default rates to clock driver [5.10,052/199] ALSA: hda/tegra: fix tegra-hda on tegra30 soc [5.10,053/199] riscv: cacheinfo: Fix using smp_processor_id() in preemptible [5.10,054/199] arm64: make atomic helpers __always_inline [5.10,055/199] xen: Fix event channel callback via INTX/GSI [5.10,056/199] x86/xen: Add xen_no_vector_callback option to test PCI INTX delivery [5.10,057/199] x86/xen: Fix xen_hvm_smp_init() when vector callback not available [5.10,058/199] dts: phy: fix missing mdio device and probe failure of vsc8541-01 device [5.10,059/199] dts: phy: add GPIO number and active state used for phy reset [5.10,060/199] riscv: defconfig: enable gpio support for HiFive Unleashed [5.10,061/199] drm/amdgpu/psp: fix psp gfx ctrl cmds [5.10,062/199] drm/amd/display: disable dcn10 pipe split by default [5.10,063/199] HID: logitech-hidpp: Add product ID for MX Ergo in Bluetooth mode [5.10,064/199] drm/amd/display: Fix to be able to stop crc calculation [5.10,066/199] drm/nouveau/privring: ack interrupts the same way as RM [5.10,067/199] drm/nouveau/i2c/gm200: increase width of aux semaphore owner fields [5.10,068/199] drm/nouveau/mmu: fix vram heap sizing [5.10,069/199] drm/nouveau/kms/nv50-: fix case where notifier buffer is at offset 0 [5.10,070/199] io_uring: flush timeouts that should already have expired [5.10,071/199] libperf tests: If a test fails return non-zero [5.10,072/199] libperf tests: Fail when failing to get a tracepoint id [5.10,073/199] RISC-V: Set current memblock limit [5.10,074/199] RISC-V: Fix maximum allowed phsyical memory for RV32 [5.10,075/199] x86/xen: fix nopvspin build error [5.10,076/199] nfsd: Fixes for nfsd4_encode_read_plus_data() [5.10,077/199] nfsd: Dont set eof on a truncated READ_PLUS [5.10,078/199] gpiolib: cdev: fix frame size warning in gpio_ioctl() [5.10,079/199] pinctrl: aspeed: g6: Fix PWMG0 pinctrl setting [5.10,080/199] pinctrl: mediatek: Fix fallback call path [5.10,081/199] RDMA/ucma: Do not miss ctx destruction steps in some cases [5.10,082/199] btrfs: print the actual offset in btrfs_root_name [5.10,083/199] scsi: megaraid_sas: Fix MEGASAS_IOC_FIRMWARE regression [5.10,084/199] scsi: ufs: ufshcd-pltfrm depends on HAS_IOMEM [5.10,085/199] scsi: ufs: Fix tm request when non-fatal error happens [5.10,086/199] crypto: omap-sham - Fix link error without crypto-engine [5.10,087/199] bpf: Prevent double bpf_prog_put call from bpf_tracing_prog_attach [5.10,088/199] powerpc: Use the common INIT_DATA_SECTION macro in vmlinux.lds.S [5.10,089/199] powerpc: Fix alignment bug within the init sections [5.10,090/199] arm64: entry: remove redundant IRQ flag tracing [5.10,091/199] bpf: Reject too big ctx_size_in for raw_tp test run [5.10,092/199] drm/amdkfd: Fix out-of-bounds read in kdf_create_vcrat_image_cpu() [5.10,093/199] RDMA/umem: Avoid undefined behavior of rounddown_pow_of_two() [5.10,095/199] printk: ringbuffer: fix line counting [5.10,096/199] printk: fix kmsg_dump_get_buffer length calulations [5.10,097/199] iov_iter: fix the uaccess area in copy_compat_iovec_from_user [5.10,098/199] i2c: octeon: check correct size of maximum RECV_LEN packet [5.10,099/199] drm/vc4: Unify PCM cards driver_name [5.10,100/199] platform/x86: intel-vbtn: Drop HP Stream x360 Convertible PC 11 from allow-list [5.10,101/199] platform/x86: hp-wmi: Dont log a warning on HPWMI_RET_UNKNOWN_COMMAND errors [5.10,102/199] gpio: sifive: select IRQ_DOMAIN_HIERARCHY rather than depend on it [5.10,103/199] ALSA: hda: Balance runtime/system PM if direct-complete is disabled [5.10,104/199] xsk: Clear pool even for inactive queues [5.10,105/199] selftests: net: fib_tests: remove duplicate log test [5.10,106/199] can: dev: can_restart: fix use after free bug [5.10,107/199] can: vxcan: vxcan_xmit: fix use after free bug [5.10,108/199] can: peak_usb: fix use after free bugs [5.10,109/199] perf evlist: Fix id index for heterogeneous systems [5.10,111/199] iio: common: st_sensors: fix possible infinite loop in st_sensors_irq_thread [5.10,113/199] drivers: iio: temperature: Add delay after the addressed reset command in mlx90632.c [5.10,114/199] iio: adc: ti_am335x_adc: remove omitted iio_kfifo_free() [5.10,115/199] counter:ti-eqep: remove floor [5.10,116/199] powerpc/64s: fix scv entry fallback flush vs interrupt [5.10,117/199] cifs: do not fail __smb_send_rqst if non-fatal signals are pending [5.10,119/199] x86/mmx: Use KFPU_387 for MMX string operations [5.10,120/199] x86/setup: dont remove E820_TYPE_RAM for pfn 0 [5.10,121/199] proc_sysctl: fix oops caused by incorrect command parameters [5.10,122/199] mm: fix initialization of struct page for holes in memory layout [5.10,123/199] mm: memcg/slab: optimize objcg stock draining [5.10,124/199] mm: memcg: fix memcg file_dirty numa stat [5.10,125/199] mm: fix numa stats for thp migration [5.10,126/199] io_uring: iopoll requests should also wake task ->in_idle state [5.10,127/199] io_uring: fix SQPOLL IORING_OP_CLOSE cancelation state [5.10,128/199] io_uring: fix short read retries for non-reg files [5.10,129/199] intel_th: pci: Add Alder Lake-P support [5.10,130/199] stm class: Fix module init return on allocation failure [5.10,131/199] serial: mvebu-uart: fix tx lost characters at power off [5.10,133/199] USB: ehci: fix an interrupt calltrace error [5.10,134/199] usb: gadget: aspeed: fix stop dma register setting. [5.10,135/199] USB: gadget: dummy-hcd: Fix errors in port-reset handling [5.10,136/199] usb: udc: core: Use lock when write to soft_connect [5.10,137/199] usb: bdc: Make bdc pci driver depend on BROKEN [5.10,139/199] usb: cdns3: imx: fix cant create core device the second time issue [5.10,140/199] xhci: make sure TRB is fully written before giving it to the controller [5.10,141/199] xhci: tegra: Delay for disabling LFPS detector [5.10,143/199] driver core: Fix device link device name collision [5.10,144/199] driver core: Extend device_is_dependent() [5.10,145/199] drm/i915: s/intel_dp_sink_dpms/intel_dp_set_power/ [5.10,146/199] drm/i915: Only enable DFP 4:4:4->4:2:0 conversion when outputting YCbCr 4:4:4 [5.10,147/199] x86/entry: Fix noinstr fail [5.10,148/199] x86/cpu/amd: Set __max_die_per_package on AMD [5.10,149/199] cls_flower: call nla_ok() before nla_next() [5.10,150/199] netfilter: rpfilter: mask ecn bits before fib lookup [5.10,151/199] tools: gpio: fix %llu warning in gpio-event-mon.c [5.10,152/199] tools: gpio: fix %llu warning in gpio-watch.c [5.10,153/199] drm/i915/hdcp: Update CP property in update_pipe [5.10,154/199] sh: dma: fix kconfig dependency for G2_DMA [5.10,156/199] locking/lockdep: Cure noinstr fail [5.10,157/199] ASoC: SOF: Intel: fix page fault at probe if i915 init fails [5.10,158/199] octeontx2-af: Fix missing check bugs in rvu_cgx.c [5.10,159/199] net: dsa: mv88e6xxx: also read STU state in mv88e6250_g1_vtu_getnext [5.10,160/199] selftests/powerpc: Fix exit status of pkey tests [5.10,161/199] sh_eth: Fix power down vs. is_opened flag ordering [5.10,162/199] nvme-pci: refactor nvme_unmap_data [5.10,163/199] nvme-pci: fix error unwind in nvme_map_data [5.10,164/199] cachefiles: Drop superfluous readpages aops NULL check [5.10,166/199] skbuff: back tiny skbs with kmalloc() in __netdev_alloc_skb() too [5.10,167/199] kasan: fix unaligned address is unhandled in kasan_remove_zero_shadow [5.10,168/199] kasan: fix incorrect arguments passing in kasan_add_zero_shadow [5.10,169/199] tcp: fix TCP socket rehash stats mis-accounting [5.10,170/199] net_sched: gen_estimator: support large ewma log [5.10,171/199] udp: mask TOS bits in udp_v4_early_demux() [5.10,172/199] ipv6: create multicast route with RTPROT_KERNEL [5.10,173/199] net_sched: avoid shift-out-of-bounds in tcindex_set_parms() [5.10,174/199] net_sched: reject silly cell_log in qdisc_get_rtab() [5.10,175/199] ipv6: set multicast flag on the multicast route [5.10,176/199] net: mscc: ocelot: allow offloading of bridge on top of LAG [5.10,177/199] net: Disable NETIF_F_HW_TLS_RX when RXCSUM is disabled [5.10,178/199] net: dsa: b53: fix an off by one in checking "vlan->vid" [5.10,179/199] tcp: do not mess with cloned skbs in tcp_add_backlog() [5.10,182/199] net: core: devlink: use right genl user_ptr when handling port param get/set [5.10,183/199] pinctrl: qcom: Allow SoCs to specify a GPIO function thats not 0 [5.10,184/199] pinctrl: qcom: No need to read-modify-write the interrupt status [5.10,185/199] pinctrl: qcom: Properly clear "intr_ack_high" interrupts when unmasking [5.10,186/199] pinctrl: qcom: Dont clear pending interrupts when enabling [5.10,188/199] tty: implement write_iter [5.10,189/199] tty: fix up hung_up_tty_write() conversion [5.10,191/199] x86/sev-es: Handle string port IO to kernel memory properly [5.10,192/199] tcp: Fix potential use-after-free due to double kfree() [5.10,196/199] kernfs: implement ->read_iter [5.10,198/199] kernfs: wire up ->splice_read and ->splice_write [5.10,199/199] interconnect: imx8mq: Use icc_sync_state

Commit Message

Greg Kroah-Hartman Jan. 25, 2021, 6:37 p.m. UTC

From: Pan Bian <bianpan2016@163.com>

commit 43b67309b6b2a3c08396cc9b3f83f21aa529d273 upstream.

Put the state before returning error code.

Fixes: 44596b8c4750 ("drm/atomic: Unify conflicting encoder handling.")
Signed-off-by: Pan Bian <bianpan2016@163.com>
Cc: stable@vger.kernel.org
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20210119121127.84127-1-bianpan2016@163.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 drivers/gpu/drm/drm_atomic_helper.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@ -3007,7 +3007,7 @@  int drm_atomic_helper_set_config(struct
 
 	ret = handle_conflicting_encoders(state, true);
 	if (ret)
-		return ret;
+		goto fail;
 
 	ret = drm_atomic_commit(state);