diff mbox series

[4.9,004/128] crypto: talitos - fix ECB and CBC algs ivsize

Message ID	20200619141620.369942370@linuxfoundation.org
State	New
Headers	show Return-Path: <SRS0=CyoZ=AA=vger.kernel.org=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, Su Kang Yin <cantona@cantona.net>, Christophe Leroy <christophe.leroy@csgroup.eu> Subject: [PATCH 4.9 004/128] crypto: talitos - fix ECB and CBC algs ivsize Date: Fri, 19 Jun 2020 16:31:38 +0200 Message-Id: <20200619141620.369942370@linuxfoundation.org> In-Reply-To: <20200619141620.148019466@linuxfoundation.org> References: <20200619141620.148019466@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk
Series	None \| expand [4.9,003/128] scsi: return correct blkprep status code in case scsi_init_io() fails. [4.9,004/128] crypto: talitos - fix ECB and CBC algs ivsize [4.9,005/128] ARM: 8977/1: ptrace: Fix mask for thumb breakpoint hook [4.9,007/128] drivers/net/ibmvnic: Update VNIC protocol version reporting [4.9,012/128] x86/reboot/quirks: Add MacBook6,1 reboot quirk [4.9,014/128] ALSA: es1688: Add the missed snd_card_free() [4.9,015/128] ALSA: usb-audio: Fix inconsistent card PM state after resume [4.9,016/128] ACPI: sysfs: Fix reference count leak in acpi_sysfs_add_hotplug_profile() [4.9,018/128] ACPI: GED: add support for _Exx / _Lxx handler methods [4.9,023/128] spi: bcm-qspi: when tx/rx buffer is NULL set to 0 [4.9,025/128] x86/speculation: Change misspelled STIPB to STIBP [4.9,027/128] x86/speculation: Avoid force-disabling IBPB based on STIBP and enhanced IBRS. [4.9,029/128] spi: dw: fix possible race condition [4.9,030/128] spi: dw: Fix controller unregister order [4.9,032/128] spi: Fix controller unregister order [4.9,034/128] spi: bcm2835: Fix controller unregister order [4.9,036/128] proc: Use new_inode not new_inode_pseudo [4.9,039/128] KVM: nVMX: Consult only the "basic" exit reason when routing nested exit [4.9,040/128] KVM: MIPS: Define KVM_ENTRYHI_ASID to cpu_asid_mask(&boot_cpu_data) [4.9,043/128] ath9k: Fix use-after-free Read in ath9k_wmi_ctrl_rx [4.9,045/128] ath9x: Fix stack-out-of-bounds Write in ath9k_hif_usb_rx_cb [4.9,046/128] ath9k: Fix general protection fault in ath9k_hif_usb_rx_cb [4.9,048/128] mm/slub: fix a memory leak in sysfs_slab_add() [4.9,050/128] perf: Add cond_resched() to task_function_call() [4.9,051/128] agp/intel: Reinforce the barrier after GTT updates [4.9,055/128] media: si2157: Better check for running tuner in init [4.9,056/128] objtool: Ignore empty alternatives [4.9,057/128] net: ena: fix error returning in ena_com_get_hash_function() [4.9,058/128] spi: dw: Zero DMA Tx and Rx configurations on stack [4.9,059/128] Bluetooth: Add SCO fallback for invalid LMP parameters error [4.9,061/128] spi: dw: Enable interrupts in accordance with DMA xfer mode [4.9,064/128] ARM: 8978/1: mm: make act_mm() respect THREAD_SIZE [4.9,065/128] x86/kvm/hyper-v: Explicitly align hcall param for kvm_hyperv_exit [4.9,067/128] staging: android: ion: use vmap instead of vm_map_ram [4.9,068/128] e1000: Distribute switch variables for initialization [4.9,071/128] media: platform: fcp: Set appropriate DMA parameters [4.9,072/128] MIPS: Make sparse_init() using top-down allocation [4.9,077/128] net: allwinner: Fix use correct return type for ndo_start_xmit() [4.9,078/128] powerpc/spufs: fix copy_to_user while atomic [4.9,080/128] mips: cm: Fix an invalid error code of INTVN_*_ERR [4.9,081/128] kgdb: Fix spurious true from in_dbg_master() [4.9,083/128] rtlwifi: Fix a double free in _rtl_usb_tx_urb_setup() [4.9,086/128] mips: Add udelay lpj numbers adjustment [4.9,087/128] x86/mm: Stop printing BRK addresses [4.9,091/128] MIPS: Fix IRQ tracing when call handle_fpe() and handle_msa_fpe() [4.9,092/128] staging: greybus: sdio: Respect the cmd->busy_timeout from the mmc core [4.9,093/128] ixgbe: fix signed-integer-overflow warning [4.9,095/128] spi: dw: Return any value retrieved from the dma_transfer callback [4.9,097/128] btrfs: send: emit file capabilities after chown [4.9,099/128] ima: Fix ima digest hash table key calculation [4.9,102/128] ext4: fix EXT_MAX_EXTENT/INDEX to check for zeroed eh_max [4.9,104/128] btrfs: fix error handling when submitting direct I/O bio [4.9,105/128] blk-mq: move blk_mq_update_nr_hw_queues synchronize_rcu call [4.9,107/128] e1000e: Relax condition to trigger reset for ME workaround [4.9,108/128] carl9170: remove P2P_GO support [4.9,109/128] media: go7007: fix a miss of snd_card_free [4.9,110/128] b43legacy: Fix case where channel status is corrupted [4.9,112/128] b43_legacy: Fix connection problem with WPA3 [4.9,114/128] power: vexpress: add suppress_bind_attrs to true [4.9,117/128] sparc64: fix misuses of access_process_vm() in genregs32_[sg]et() [4.9,119/128] ARM: tegra: Correct PL310 Auxiliary Control Register initialization [4.9,120/128] drivers/macintosh: Fix memleak in windfarm_pm112 driver [4.9,123/128] sunrpc: clean up properly in gss_mech_unregister() [4.9,124/128] mtd: rawnand: brcmnand: fix hamming oob layout [4.9,126/128] w1: omap-hdq: cleanup to add missing newline for some dev_dbg

Commit Message

Greg KH June 19, 2020, 2:31 p.m. UTC

From: Su Kang Yin <cantona@cantona.net>

commit e1de42fdfc6a ("crypto: talitos - fix ECB algs ivsize")
wrongly modified CBC algs ivsize instead of ECB aggs ivsize.

This restore the CBC algs original ivsize of removes ECB's ones.

Fixes: e1de42fdfc6a ("crypto: talitos - fix ECB algs ivsize")
Signed-off-by: Su Kang Yin <cantona@cantona.net>
Reviewed-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 drivers/crypto/talitos.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

--- a/drivers/crypto/talitos.c
+++ b/drivers/crypto/talitos.c
@@ -2636,7 +2636,6 @@  static struct talitos_alg_template drive
 			.cra_ablkcipher = {
 				.min_keysize = AES_MIN_KEY_SIZE,
 				.max_keysize = AES_MAX_KEY_SIZE,
-				.ivsize = AES_BLOCK_SIZE,
 			}
 		},
 		.desc_hdr_template = DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU |
@@ -2670,6 +2669,7 @@  static struct talitos_alg_template drive
 			.cra_ablkcipher = {
 				.min_keysize = AES_MIN_KEY_SIZE,
 				.max_keysize = AES_MAX_KEY_SIZE,
+				.ivsize = AES_BLOCK_SIZE,
 				.setkey = ablkcipher_aes_setkey,
 			}
 		},