Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   George Kennedy <george.kennedy@oracle.com>
To:     gregkh@linuxfoundation.org, jejb@linux.ibm.com,
        martin.petersen@oracle.com
Cc:     george.kennedy@oracle.com, linux-scsi@vger.kernel.org,
        linux-kernel@vger.kernel.org, dan.carpenter@oracle.com
Subject: [PATCH] scsi: scsi_debug: fix return checks for kcalloc
Date:   Wed,  3 Nov 2021 14:01:42 -0500
Message-Id: <1635966102-29320-1-git-send-email-george.kennedy@oracle.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?U//rSEbwPSQfGuqQwg/DbrnGlzlH0hoBoMc0EezpfdV1bturdn7qpbz5p5qQ?=
 =?us-ascii?Q?OBRHnTn9SrzDWTLyC3MPwZN93vFqVjNy76uZUAFwF9qJwshGkSO1bStfJ1zz?=
 =?us-ascii?Q?0FgAgneoepESN0GC/KFFrTdb99Cy+WAYkyWD8K/1G1crSBtpIzAK/Yj8zhkz?=
 =?us-ascii?Q?ZDuSKwC0p8B4vG/RZrENuQyK9yUTxpulW3YWNtN9qGfndsqPM5pnIHSCJXxO?=
 =?us-ascii?Q?KV7EW0UGAdh4gqfewYtun15VwLVBi4w/ru/jxYwnoVo0FO1l8ZkFLx5ZSOIf?=
 =?us-ascii?Q?Y9vb0W+tmmJOaUOUskq/d6uAhORkfuRHHV3rF91IF45F11r2CPBW48P1AcK8?=
 =?us-ascii?Q?fq7/1Xg9TdVIAvLjV65IynoGf3k5VKKBNrNsd5QqnbyemFjfL89p0SSA+/OI?=
 =?us-ascii?Q?vrnJktGgIjCaYFdAlOlBqo25Cly7qxLaVZRGFUwl+2uN5mHAqHGfWEAM661c?=
 =?us-ascii?Q?MU9nMZnalfeZOeds+UnqwnunUq8lli3ydQ8l4jGeiDhBVwC6hCQnAG9lIMVH?=
 =?us-ascii?Q?xJ5ps+0bqieSqwPER6FyDSLIVbyKs1HKJFu9MRLrdgLH1oV4OfTmtemxS4ww?=
 =?us-ascii?Q?MseScLl657ozX4h7eF/9HZayC520diuq92kU1zquLsfq4VG2ia5vVgvl2aB0?=
 =?us-ascii?Q?dhHM0j3GhbHdqH/G3ozZkjE9+zaapabojBc4aTK/I1+3sK1gNKf7ZwyMAkgI?=
 =?us-ascii?Q?N8ZCCBqhN/wUXjAjT/0JIZP1ZWuS4S3S/dxqNgcfU8H2V5wHFhxEsjUoicif?=
 =?us-ascii?Q?oxm5Aen5oTN93oCoyvVtp+bY3PlrqqlheViSckRqLuCiUpOcv5Wt257QzrIW?=
 =?us-ascii?Q?/Z+vN/ySg7KthdiJJhf8ll5WBTddgwNeiYWPpJkEIS6chvV66DD+tTc6pVLC?=
 =?us-ascii?Q?ev0Ne3PjcXS26B5Z2nGjB36fckXr8Hwb/veW/uzZfU6FL7rWoaNI4qB2XUED?=
 =?us-ascii?Q?wX0CpNCNPcu2aAOGCFe7RbN7PrwkJYe24nmlOvPurDLtua5Gwy35vDN1+j1R?=
 =?us-ascii?Q?jYnc0bFRrbQNGxKJOwz0qSCuRdgMJq2C3zjFhTCa2Zn0Iq7PSQW3c+gLiIcB?=
 =?us-ascii?Q?4oRKP8VpvgDqMz5S1JHPSGr6gDIlQYdE1bvAPeU+VSwY1xYeqlB6GpNkwiOr?=
 =?us-ascii?Q?kLJMxy8R2eEEQU3EtJfcIgzvClW3fnDoN+uvpDfiLsgFvWa9kFH+AKQN7e7q?=
 =?us-ascii?Q?NltCHNhl+w/3Vkv5e6xh44e53n6oA1FQ64tVvid3XC9TUqP41ljg2gszsWM3?=
 =?us-ascii?Q?ZPxb53sQdUThJ8uHxdkgxfU5JLnztiKR/S1cgGHTTVzWUktjUcqnpuFMPO6g?=
 =?us-ascii?Q?WlNmDKmAyIHob3Hor3Luc/pLknRLv89AaiFim13XwnLnwpZxtro9oebTWIpQ?=
 =?us-ascii?Q?8DvgVCeTq54pWAus4cbtmda+30kGSif5IYqJYF2N25t94fJ2z943DY4RW5On?=
 =?us-ascii?Q?tS/FjWzBymJMrNA5jm+ShUops34mZvkZaAusJu+7+aR9R/i7hZNDft5djBsw?=
 =?us-ascii?Q?itY7NNuiiSrsTU7ChhHiD3sBYlctuX0VW3aKR+IzNog/W0coK43/cr9uICGW?=
 =?us-ascii?Q?bMPsS7QdifKEh87O4zxRziN8MiyTBZ5SrYKgjqgnP2kVpHeXXGV92bMdc5Cg?=
 =?us-ascii?Q?onkrlTOQ9Nn1IKG0lKoprgq5YoSSNobvFtYE7C/5Ep9CGK3eCwAACk06NgFh?=
 =?us-ascii?Q?rWCEfg=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: d0aea446-c3df-42b8-90b0-08d99efcaf37
X-MS-Exchange-CrossTenant-AuthSource: BN0PR10MB5192.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Nov 2021 19:03:56.0407
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: n4+fonhSXJqLzZkg7niGhmDsWBFw+bTCUwcfJibS5EpOKajHYLLt3EH8U/67VpMFY1z/Xw3qetthU0SiniX3lUDM+cxX+ngan6AYy6M9jI0=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN0PR10MB5254
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10157 signatures=668683
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 phishscore=0 malwarescore=0
 mlxscore=0 suspectscore=0 mlxlogscore=999 adultscore=0 spamscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000
 definitions=main-2111030100
X-Proofpoint-ORIG-GUID: 60vUCEYzA5D_B16rDXrTyRhZ9Q8TrYqy
X-Proofpoint-GUID: 60vUCEYzA5D_B16rDXrTyRhZ9Q8TrYqy
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Change return checks from kcalloc() to now check for NULL and
ZERO_SIZE_PTR using the ZERO_OR_NULL_PTR macro or the following
crash can occur if ZERO_SIZE_PTR indicator is returned.

BUG: KASAN: null-ptr-deref in memcpy include/linux/fortify-string.h:191 [inline]
BUG: KASAN: null-ptr-deref in sg_copy_buffer+0x138/0x240 lib/scatterlist.c:974
Write of size 4 at addr 0000000000000010 by task syz-executor.1/22789

CPU: 1 PID: 22789 Comm: syz-executor.1 Not tainted 5.15.0-syzk #1
Hardware name: Red Hat KVM, BIOS 1.13.0-2
Call Trace:
 __dump_stack lib/dump_stack.c:88 [inline]
 dump_stack_lvl+0x89/0xb5 lib/dump_stack.c:106
 __kasan_report mm/kasan/report.c:446 [inline]
 kasan_report.cold.14+0x112/0x117 mm/kasan/report.c:459
 check_region_inline mm/kasan/generic.c:183 [inline]
 kasan_check_range+0x1a3/0x210 mm/kasan/generic.c:189
 memcpy+0x3b/0x60 mm/kasan/shadow.c:66
 memcpy include/linux/fortify-string.h:191 [inline]
 sg_copy_buffer+0x138/0x240 lib/scatterlist.c:974
 do_dout_fetch drivers/scsi/scsi_debug.c:2954 [inline]
 do_dout_fetch drivers/scsi/scsi_debug.c:2946 [inline]
 resp_verify+0x49e/0x930 drivers/scsi/scsi_debug.c:4276
 schedule_resp+0x4d8/0x1a70 drivers/scsi/scsi_debug.c:5478
 scsi_debug_queuecommand+0x8c9/0x1ec0 drivers/scsi/scsi_debug.c:7533
 scsi_dispatch_cmd drivers/scsi/scsi_lib.c:1520 [inline]
 scsi_queue_rq+0x16b0/0x2d40 drivers/scsi/scsi_lib.c:1699
 blk_mq_dispatch_rq_list+0xb9b/0x2700 block/blk-mq.c:1639
 __blk_mq_sched_dispatch_requests+0x28f/0x590 block/blk-mq-sched.c:325
 blk_mq_sched_dispatch_requests+0x105/0x190 block/blk-mq-sched.c:358
 __blk_mq_run_hw_queue+0xe5/0x150 block/blk-mq.c:1761
 __blk_mq_delay_run_hw_queue+0x4f8/0x5c0 block/blk-mq.c:1838
 blk_mq_run_hw_queue+0x18d/0x350 block/blk-mq.c:1891
 blk_mq_sched_insert_request+0x3db/0x4e0 block/blk-mq-sched.c:474
 blk_execute_rq_nowait+0x16b/0x1c0 block/blk-exec.c:62
 blk_execute_rq+0xdb/0x360 block/blk-exec.c:102
 sg_scsi_ioctl drivers/scsi/scsi_ioctl.c:621 [inline]
 scsi_ioctl+0x8bb/0x15c0 drivers/scsi/scsi_ioctl.c:930
 sg_ioctl_common+0x172d/0x2710 drivers/scsi/sg.c:1112
 sg_ioctl+0xa2/0x180 drivers/scsi/sg.c:1165
 vfs_ioctl fs/ioctl.c:51 [inline]
 __do_sys_ioctl fs/ioctl.c:874 [inline]
 __se_sys_ioctl fs/ioctl.c:860 [inline]
 __x64_sys_ioctl+0x19d/0x220 fs/ioctl.c:860
 do_syscall_x64 arch/x86/entry/common.c:50 [inline]
 do_syscall_64+0x3a/0x80 arch/x86/entry/common.c:80
 entry_SYSCALL_64_after_hwframe+0x44/0xae

Reported-by: syzkaller <syzkaller@googlegroups.com>
Signed-off-by: George Kennedy <george.kennedy@oracle.com>
---
 drivers/scsi/scsi_debug.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
index 40b473e..222e985 100644
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@ -3909,7 +3909,7 @@ static int resp_comp_write(struct scsi_cmnd *scp,
 		return ret;
 	dnum = 2 * num;
 	arr = kcalloc(lb_size, dnum, GFP_ATOMIC);
-	if (NULL == arr) {
+	if (ZERO_OR_NULL_PTR(arr)) {
 		mk_sense_buffer(scp, ILLEGAL_REQUEST, INSUFF_RES_ASC,
 				INSUFF_RES_ASCQ);
 		return check_condition_result;
@@ -4265,7 +4265,7 @@ static int resp_verify(struct scsi_cmnd *scp, struct sdebug_dev_info *devip)
 		return ret;
 
 	arr = kcalloc(lb_size, vnum, GFP_ATOMIC);
-	if (!arr) {
+	if (ZERO_OR_NULL_PTR(arr)) {
 		mk_sense_buffer(scp, ILLEGAL_REQUEST, INSUFF_RES_ASC,
 				INSUFF_RES_ASCQ);
 		return check_condition_result;
@@ -4334,7 +4334,7 @@ static int resp_report_zones(struct scsi_cmnd *scp,
 			    max_zones);
 
 	arr = kcalloc(RZONES_DESC_HD, alloc_len, GFP_ATOMIC);
-	if (!arr) {
+	if (ZERO_OR_NULL_PTR(arr)) {
 		mk_sense_buffer(scp, ILLEGAL_REQUEST, INSUFF_RES_ASC,
 				INSUFF_RES_ASCQ);
 		return check_condition_result;
-- 
1.8.3.1