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;
Message-ID: <a7b4e31b-d548-5a29-9d98-fc6e916ac7fc@oracle.com>
Date:   Thu, 4 Nov 2021 13:22:34 -0400
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101
 Thunderbird/91.2.1
Subject: Re: [PATCH] scsi: scsi_debug: fix return checks for kcalloc
Content-Language: en-CA
To:     Joe Perches <joe@perches.com>, gregkh@linuxfoundation.org,
        jejb@linux.ibm.com, martin.petersen@oracle.com
Cc:     linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org,
        dan.carpenter@oracle.com
References: <1635966102-29320-1-git-send-email-george.kennedy@oracle.com>
 <834e83a227f40c4654b97f2f0b045b4cbd326f16.camel@perches.com>
From:   George Kennedy <george.kennedy@oracle.com>
Organization: Oracle Corporation
In-Reply-To: <834e83a227f40c4654b97f2f0b045b4cbd326f16.camel@perches.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Ri82NmVrcDN0RXg2eEk0dmpuNytyc0g1YzVKWTR4ZDF1Rld1WlhSbnBtT0o1?=
 =?utf-8?B?dlhwblMxZFo3Y3ZsdDVpQktOd25GYzFxRkZmSXdPakJKMTdHd0dyTGRhNTh0?=
 =?utf-8?B?aENma1k3SUR3a3ppOGpQWnVYMllVeVkyNklXbEpDcjMzengxamx1eVRhVmxo?=
 =?utf-8?B?QnRKRWFyOEF0TXFEM0V1Z1BzSXBnTHJHMVkrb0FVWlpwZkpRL3ZlVFJCRFN5?=
 =?utf-8?B?eTNsdEFFeTM2VFZ3T1dnellWb3pYTEF4dFFxejE5ZFIyeXJ0aGMvTXRPRkYr?=
 =?utf-8?B?eUdvRHZKVFJJbCtySUNQMmJBcDh1Q1RHbUxuU2tPaWNiVzlVNk5BL2Nxc2w3?=
 =?utf-8?B?Ukl2SkFxTEIwNCtXTGtidlRTb1FnWVhOWjIxYVpwQkRmdzFWdDB3enRaeVhU?=
 =?utf-8?B?Y3R5V3kyN3BtRjJZdTcrWERhcGZFRXJZNVZNMXk4OGFGYnBnUW1QZlJpd2JZ?=
 =?utf-8?B?VGJlbTVQRVVQbG5INmdETVV2eFZWUE5kbEI1NGs0L2RrZ0FBZE9tNGhlS0pR?=
 =?utf-8?B?UjVmd2pJMno1R1dQQTB3azhSa0RDSkxHbnpzbVRWWEdoRi84L3RXSkY4Mmxn?=
 =?utf-8?B?Y0VVcHh1RW5jQnJsc3ZZbzVINStML09jSWF1NTNjNmRlZ29Sb0FFZWk4Zjdp?=
 =?utf-8?B?MVNMaHF4NjR1a2FzNitOTC9XK0lxQ1QxM2RpUW96d1ZqaU1oZHNFVHBHQ1Ew?=
 =?utf-8?B?WGxMZVQ0K1pDNlZ2YThreTF5Slg0dS9sdkNUUFVubW42YlhGOHFjREZJanVC?=
 =?utf-8?B?VVFyZ3djYnBFSjVLL1lZYW5QMXVIcVBUUitydDlETmM1WGZOckltdG1WVDVR?=
 =?utf-8?B?eU16NlJGSnowS0hqUC9xbld0d1k5WnFsVC9LS2M3RktFdWR5aHRTeVcvT1RM?=
 =?utf-8?B?eUhwanBMbzdyRkdpN1YwOXVyNVVidWQvOUhNbmpVbjF6Wmd6SGxzZjF4S3VB?=
 =?utf-8?B?a0JBZ3pIRHpJckg5NnhtM29WWURpRFZuY0V1NWk3eXVRZlJDQ1JsZFFkbkYw?=
 =?utf-8?B?UmtEN1E4bW4vRkROWjBEYkRERXBLQWdhVG9BNHJLN3p5UFVHZ1FlaUt3aUVF?=
 =?utf-8?B?THlPRUNyYWsyUnZWZHM3NVBheW9vL1huZU5ZbVVJRjN1SFVhcFJmelBtQTJJ?=
 =?utf-8?B?cWRhTForK1B2NEU1OW0yZmp3eEI2S1NqWC9Mc1kxUVBvNWNEKzNWbFZMK1JW?=
 =?utf-8?B?Y1hFS2t1eWRYM0c2clR0Sm1vWVNCVG41cFJNOG9jblI0S3l3b21nMlRQRUxz?=
 =?utf-8?B?bmJzUncyNHZodW1IT1VHOUl5VFJSZUpCQXJ5MnBrNDVnUzB1ZWlPRU5IREZu?=
 =?utf-8?B?TUY2akJ0RHZMVWNuVHJyTCtZbnBPa0VraWJ4amgwRjR0dXVDMlgvT1NNdTBQ?=
 =?utf-8?B?cDBMemtOWlNOb0R2NE42U0JwMlMrMkUvaHlPYTdNajU5SC83THc5K3JnY0Z4?=
 =?utf-8?B?N3VqTkQxNlNqZnJsMGVWWHJMR2gwNGV0U2I3WGhyWjNQcWRscWFPc1pGcmwz?=
 =?utf-8?B?T045aWlDKzR0eExXaEFiVzNUQWRjbnBXZ3FZQW5ZdXVqV1VtdFFpSTZ1VEVB?=
 =?utf-8?B?c1RhQTNnZk1NNEFjZVVRUTMzcGllSTd2dGo0M3RnYVMzOTZXWXNSL3N5Wnky?=
 =?utf-8?B?RENtVm9GRytPNnNPUUV5S1ZGWlVidTFDWFpFLzZ6QVRvSm9tc2syRHNRZGtq?=
 =?utf-8?B?bFlIVEFiUTB3YmN5UDZBWXoxMTR5RzdNejJmaVlRY2swUGtYbmFBcXZOcStF?=
 =?utf-8?B?bEFkQndRSTlpa1ZBZ3Fmd2Y0S2htclVxMVZ1SjdHemxHQjBVNnQ5aktCTmFv?=
 =?utf-8?B?RHRTSGVyTTBHQzF2U1YxSVg5UGVMeEh6dENNSWpuem5NN2dhaytDUy9mY2lz?=
 =?utf-8?B?K3d6YmxoUFVrcDBpcjdDTzN3RTJmYmRHUVJWVHFKalBKV3FoMVFaaE4zY3pk?=
 =?utf-8?B?MVE4eFE4L3czOUx0cUJvbVJ5STc4OHpiQU9DdUpLbnB5cVFCQkpJK2RkcStz?=
 =?utf-8?B?R3ZKQjRqWTE5bUp4TFNYYmg5cTR3STN2R2ovRHgrcHlvS2VCdGZkSlhLZVlE?=
 =?utf-8?B?ZFoxQXduY2kvTVA1ODRJbFlOTlREZzRDTnFHdWMvbUp3SmVQcUdaRkZ4ektn?=
 =?utf-8?B?OW9VT2FSdjZqVEdaRE9VZGhuZ2lqQ1NHOGZrQ2NFK1lZcCt5TnpaejVsK1Ju?=
 =?utf-8?B?NzJRZnBuZy9jZzcxOGhxYWNTbkFyVFlNc3RaWEFEQnljejBFVGJ1R0RSTDFy?=
 =?utf-8?B?T2kycWkyb3BxOTRySnM0OUtxbUx3PT0=?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 9f5717d2-73b2-497d-55f0-08d99fb7b2b5
X-MS-Exchange-CrossTenant-AuthSource: BN0PR10MB5192.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Nov 2021 17:22:37.8981
 (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: 6pNGRtncBKbim43vcxSon/z6LSugY6YUfoVjOXK7ULUvpIO4mgx31TVr34mMDCNzNho6Ybfva53hjIFrKUO6eiufN08AsaEoe/zI9Tx3e5c=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN0PR10MB5046
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10158 signatures=668683
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 phishscore=0 bulkscore=0
 spamscore=0 adultscore=0 suspectscore=0 mlxlogscore=999 mlxscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000
 definitions=main-2111040066
X-Proofpoint-GUID: TscKvuWHQP5lDNNhqVfGtXfvAvZ70fFa
X-Proofpoint-ORIG-GUID: TscKvuWHQP5lDNNhqVfGtXfvAvZ70fFa
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Thanks Joe,

On 11/4/2021 12:04 PM, Joe Perches wrote:
> On Wed, 2021-11-03 at 14:01 -0500, George Kennedy wrote:
>> 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
> []
>> diff --git 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;
> This one isn't necessary as num is already tested for non-0 above
> this block.

The check for "num" preceding the above does this:

         if (0 == num)
                 return 0;       /* degenerate case, not an error */

Shouldn't I use that same size check and "return 0" if size == zero in 
the other cases?

>
>> @@ -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;
> Here it's probably clearer code to test vnum == 0 before the kcalloc
> and 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;
> And here test alloc_len == 0 before the kcalloc.

Using your suggested fix (with return 0 instead of return 
check_condition_result) the patch would look like this:

diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
index 40b473e..93913d2 100644
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@ -4258,6 +4258,8 @@ static int resp_verify(struct scsi_cmnd *scp, 
struct sdebug_dev_info *devip)
                 mk_sense_invalid_opcode(scp);
                 return check_condition_result;
         }
+       if (0 == vnum)
+               return 0;       /* degenerate case, not an error */
         a_num = is_bytchk3 ? 1 : vnum;
         /* Treat following check like one for read (i.e. no write) 
access */
         ret = check_device_access_params(scp, lba, a_num, false);
@@ -4321,6 +4323,8 @@ static int resp_report_zones(struct scsi_cmnd *scp,
         }
         zs_lba = get_unaligned_be64(cmd + 2);
         alloc_len = get_unaligned_be32(cmd + 10);
+       if (0 == alloc_len)
+               return 0;       /* degenerate case, not an error */
         rep_opts = cmd[14] & 0x3f;
         partial = cmd[14] & 0x80;


Does the above look ok?

George

>
>