Received: by 2002:a05:6358:f14:b0:e5:3b68:ec04 with SMTP id b20csp4226959rwj; Tue, 20 Dec 2022 07:35:46 -0800 (PST) X-Google-Smtp-Source: AA0mqf67owurdA96ERq8ISQCXpeM0KwPwrYLTKL8T7cOrSjW3Q4q+KXJSgteaRF4EtgX+YbJ8Ep0 X-Received: by 2002:a17:907:8c81:b0:7c1:5b5e:4d85 with SMTP id td1-20020a1709078c8100b007c15b5e4d85mr32617451ejc.51.1671550545740; Tue, 20 Dec 2022 07:35:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671550545; cv=none; d=google.com; s=arc-20160816; b=kySR+/yZX2A9EtjXOnLyRdO8+tZ694aL7RVFRff5Ut3BKG3iIxlZyiw0fhkhpzt5c2 DRWSQECTlaysV362ZQ9CJGAWjUBhqL3PWDty9aU6fHllpysCEsJLZAABhAwSCXHlkShN ZfozkbNDY0CyBLZN+cFAgqMUshOchd34hB0DfeAjn1XuBqDqUM3jpS5RzOvW3q58BWiJ 2w53+iUyQoMnLAAKwsbCPGliaCp1mRMxAkQj7t6oYw82u7m59b3QkmB+s3ePe6R2pJlf hya4DhxrttmiQy3G8mcWrRkkrwcLxxq9pi+myLsFGtJo1i5R0UvrmMgGNlbUaonMm3vK K6ZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:user-agent:references:message-id :in-reply-to:subject:cc:to:from:date:dkim-signature; bh=RsLnMyjAdhgH4vMpJUtTUtjMPreM0j0mAwLTEi61cD8=; b=NVcVE5LvJnTqtF4abERTqtk1trnYPPO3d18Lau1sxFmnpMW0ZrF11aVdqbzhrKUQSP JJZepe7u0Ahml+HQPH48RoYfKf0RyBwwopwkygIqn0/HKCZXtu7oGNEZJT3eg3lZ25Le xrcGWYgsUsqDUD+GiWNu3mjKJr2k9orPbTro6iHYDaR6PPb5kVrY99EQCg77WMf+DA2m +fpNF5BkJ+A38dL/JAsNnC0Y7nSOYnmUKSUR7SmMrFLnILQ7VGr18NyVc5BwoOYhPfUp UGBsimxonMnq+7lQ9X55ywpFUaEP46YTWTHsoBVuWh1XkBzeqiaU2NkrXajr5lqj831Q 2uZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=lXpBWJsI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hd39-20020a17090796a700b007c170f6b32esi12809034ejc.527.2022.12.20.07.35.28; Tue, 20 Dec 2022 07:35:45 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=lXpBWJsI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234210AbiLTOv4 (ORCPT + 69 others); Tue, 20 Dec 2022 09:51:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45016 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233595AbiLTOvV (ORCPT ); Tue, 20 Dec 2022 09:51:21 -0500 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 530501C93B; Tue, 20 Dec 2022 06:51:20 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id 9FF97CE131B; Tue, 20 Dec 2022 14:51:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B54F5C433EF; Tue, 20 Dec 2022 14:51:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1671547876; bh=kGMXu02MAUd9IY696qws7gEYoafHdtsgJ2OQAK7H7nA=; h=Date:From:To:cc:Subject:In-Reply-To:References:From; b=lXpBWJsI0IM3IVu8x4LJxHv0XIVEn1CtDiNiuZCVgXt83S0wKrdcLyo9hH+LiMV4S YxBCzCLsCbrFthuHNY8swZgC9QDAGEAQPzzVREcdDVFg5BJ8qGHJkzto2wdL53V5OV ds+76LbLpoxBcka3Hv/mD5az29ZeTLL2aN5/s6MPjYVxmtnSj1GEru7zKgaghnTco3 6WGjLqmuASRPP/zTM3Z1PLI4ZfNZgSKt0BFPVF2Op+kaPp7Zo2vEFcZsEn3pYSqGbH OlrVm3aw59InBWk8SR9eRskAhNZJq9Rs2uKwf+D45EHwGJSTR0K12ps7Es8adISGIs 4pr4wSkCf4gtw== Date: Tue, 20 Dec 2022 15:51:17 +0100 (CET) From: Jiri Kosina To: Jiasheng Jiang cc: srinivas.pandruvada@linux.intel.com, benjamin.tissoires@redhat.com, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] HID: intel_ish-hid: Add check for ishtp_dma_tx_map In-Reply-To: <20221122134823.540-1-jiasheng@iscas.ac.cn> Message-ID: References: <20221122134823.540-1-jiasheng@iscas.ac.cn> User-Agent: Alpine 2.21 (LSU 202 2017-01-01) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 22 Nov 2022, Jiasheng Jiang wrote: > As the kcalloc may return NULL pointer, > it should be better to check the ishtp_dma_tx_map > before use in order to avoid NULL pointer dereference. > > Fixes: 3703f53b99e4 ("HID: intel_ish-hid: ISH Transport layer") > Signed-off-by: Jiasheng Jiang Srinivas, can I get your Ack on this one, please? I'd much prefer to perform the check right at the allocation time, but that would need some more code refactoring (as there is currently no way for ishtp_cl_alloc_dma_buf() to fail). > --- > drivers/hid/intel-ish-hid/ishtp/dma-if.c | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/drivers/hid/intel-ish-hid/ishtp/dma-if.c b/drivers/hid/intel-ish-hid/ishtp/dma-if.c > index 40554c8daca0..00046cbfd4ed 100644 > --- a/drivers/hid/intel-ish-hid/ishtp/dma-if.c > +++ b/drivers/hid/intel-ish-hid/ishtp/dma-if.c > @@ -104,6 +104,11 @@ void *ishtp_cl_get_dma_send_buf(struct ishtp_device *dev, > int required_slots = (size / DMA_SLOT_SIZE) > + 1 * (size % DMA_SLOT_SIZE != 0); > > + if (!dev->ishtp_dma_tx_map) { > + dev_err(dev->devc, "Fail to allocate Tx map\n"); I'd also suggest to use "Failed to ..." instead. Thanks, -- Jiri Kosina SUSE Labs