From 07293fd5135bea2a37e89e968d5ff5efce21b5ad Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Fri, 2 Oct 2020 09:14:21 +0200 Subject: [PATCH] - up to 5.4.69 --- kernel-small_fixes.patch | 50 ---------------------------------------- kernel.spec | 4 ++-- 2 files changed, 2 insertions(+), 52 deletions(-) diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch index 081469f2..a611dd91 100644 --- a/kernel-small_fixes.patch +++ b/kernel-small_fixes.patch @@ -422,56 +422,6 @@ index 2142a649e865..3f268f669cc3 100644 return fibptr; } -commit c86fbe484c10b2cd1e770770db2d6b2c88801c1d -Author: Balsundar P -Date: Tue Oct 15 11:51:58 2019 +0530 - - scsi: aacraid: fix illegal IO beyond last LBA - - The driver fails to handle data when read or written beyond device reported - LBA, which triggers kernel panic - - Link: https://lore.kernel.org/r/1571120524-6037-2-git-send-email-balsundar.p@microsemi.com - Signed-off-by: Balsundar P - Signed-off-by: Martin K. Petersen - -diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c -index 0ed3f806ace5..2388143d59f5 100644 ---- a/drivers/scsi/aacraid/aachba.c -+++ b/drivers/scsi/aacraid/aachba.c -@@ -2467,13 +2467,13 @@ static int aac_read(struct scsi_cmnd * scsicmd) - scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8 | - SAM_STAT_CHECK_CONDITION; - set_sense(&dev->fsa_dev[cid].sense_data, -- HARDWARE_ERROR, SENCODE_INTERNAL_TARGET_FAILURE, -+ ILLEGAL_REQUEST, SENCODE_LBA_OUT_OF_RANGE, - ASENCODE_INTERNAL_TARGET_FAILURE, 0, 0); - memcpy(scsicmd->sense_buffer, &dev->fsa_dev[cid].sense_data, - min_t(size_t, sizeof(dev->fsa_dev[cid].sense_data), - SCSI_SENSE_BUFFERSIZE)); - scsicmd->scsi_done(scsicmd); -- return 1; -+ return 0; - } - - dprintk((KERN_DEBUG "aac_read[cpu %d]: lba = %llu, t = %ld.\n", -@@ -2559,13 +2559,13 @@ static int aac_write(struct scsi_cmnd * scsicmd) - scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8 | - SAM_STAT_CHECK_CONDITION; - set_sense(&dev->fsa_dev[cid].sense_data, -- HARDWARE_ERROR, SENCODE_INTERNAL_TARGET_FAILURE, -+ ILLEGAL_REQUEST, SENCODE_LBA_OUT_OF_RANGE, - ASENCODE_INTERNAL_TARGET_FAILURE, 0, 0); - memcpy(scsicmd->sense_buffer, &dev->fsa_dev[cid].sense_data, - min_t(size_t, sizeof(dev->fsa_dev[cid].sense_data), - SCSI_SENSE_BUFFERSIZE)); - scsicmd->scsi_done(scsicmd); -- return 1; -+ return 0; - } - - dprintk((KERN_DEBUG "aac_write[cpu %d]: lba = %llu, t = %ld.\n", - ; https://lkml.org/lkml/2019/7/10/244 diff -ur linux-5.3/drivers/scsi/aacraid.org/aacraid.h linux-5.3/drivers/scsi/aacraid/aacraid.h --- linux-5.3/drivers/scsi/aacraid.org/aacraid.h 2019-11-01 22:42:37.011469816 +0100 diff --git a/kernel.spec b/kernel.spec index d832ff15..929cbcf2 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ %define rel 1 %define basever 5.4 -%define postver .68 +%define postver .69 # define this to '-%{basever}' for longterm branch %define versuffix -%{basever} @@ -123,7 +123,7 @@ Source0: https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz # Source0-md5: ce9b2d974d27408a61c53a30d3f98fb9 %if "%{postver}" != ".0" Patch0: https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz -# Patch0-md5: ae1cceaa700442630aebbb60def5a82f +# Patch0-md5: 6de39308aa683ff6cb7703f2fa6b2569 %endif Source1: kernel.sysconfig -- 2.44.0