From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AF8BCC433DF for ; Mon, 10 Aug 2020 09:53:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 79D92206B5 for ; Mon, 10 Aug 2020 09:53:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="d4KQ5oRd" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726814AbgHJJxd (ORCPT ); Mon, 10 Aug 2020 05:53:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41372 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725809AbgHJJxb (ORCPT ); Mon, 10 Aug 2020 05:53:31 -0400 Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A8B4FC061756 for ; Mon, 10 Aug 2020 02:53:30 -0700 (PDT) Received: by mail-wm1-x344.google.com with SMTP id g8so7091168wmk.3 for ; Mon, 10 Aug 2020 02:53:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=055yTlti7CSqkzeroMGhpLzAQUVt92U42Qi8+kNmwB0=; b=d4KQ5oRdaofLU1bS4195phRtm9IAhil1g45TpyJMNsdsqg9rxuavma5WVjCNEr1Zby z910xrANOJ4593ID/khi4HdCBkN3BkHQxLppjFpdekEbZlr0UmA2YeaWg5uWqyON4T/d JDa/s/FMyO8lTkSCFDq8dvdWeIhIOwhsR1TYo42BHdv47WAIQCziVv4Pq+MD6oE8bnvE 5JBAneHgPQzf57ZiEJ/z2GnRUBRVAxiQkgvL9IphvbAiXwoBQontkQVdmnrMVMAL3zRp dX6zGbWm+kMdkyPmTv7zp6lEnjG3JrgXdkzsrDofj7DyBfGfjNCkphX5aqtcaZ36s7gC ci5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=055yTlti7CSqkzeroMGhpLzAQUVt92U42Qi8+kNmwB0=; b=g2bHyPZLe5tRLoQRGOiRD9lUCAGWav9Av56JqhtRODqU+moJNuUHaFlA/4Ans74Lwn PDyRh4534EWokPA7O1QwIhIgJ/gqsqbJwcOYiSyNmjyrLsmATClRQMkRjAAsiJUWel4E jGMU8dqiJTyJ0Z1BvqY2TF+9qWMcmvvAGGTZDOT+yYVcOaFIaj0FGYDTcqNJR5vUnFNr sEVcrHksTMrRxLA4PDFbKI7ypsNTTn80thPLazjb1iLJYEMas+Iz6ogIZTsxLilyjbc7 lp2Es9BWFQXdo87EHThqeflaDetU1vUIvcbYkhRwhJGz/dodV3qUjWjPSiobyUtXb3g9 Ji6Q== X-Gm-Message-State: AOAM533vbfnLIYwxg8df8fZX+xv93itRoLdXz5yAin/1KUpjsPTR4qPj 2pmb9w99j67DeS6e7xK7QzwLOQ== X-Google-Smtp-Source: ABdhPJwikbZKK9ubEvMqGCCPHbnvwK98mxtTA4C1Br04cBnP5baqbt9HPXi/KVHqHqnR3TT6ylMaUg== X-Received: by 2002:a05:600c:290a:: with SMTP id i10mr26034717wmd.175.1597053207844; Mon, 10 Aug 2020 02:53:27 -0700 (PDT) Received: from [192.168.1.8] ([195.24.90.54]) by smtp.googlemail.com with ESMTPSA id 62sm20736508wrq.31.2020.08.10.02.53.25 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 10 Aug 2020 02:53:27 -0700 (PDT) Subject: Re: [RESEND 3/3] venus: handle use after free for iommu_map/iommu_unmap To: Mansur Alisha Shaik , linux-media@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, vgarodia@codeaurora.org References: <1596781478-12216-1-git-send-email-mansur@codeaurora.org> <1596781478-12216-4-git-send-email-mansur@codeaurora.org> From: Stanimir Varbanov Message-ID: Date: Mon, 10 Aug 2020 12:53:22 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <1596781478-12216-4-git-send-email-mansur@codeaurora.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, On 8/7/20 9:24 AM, Mansur Alisha Shaik wrote: > In concurrency usecase and reboot scenario we are trying > to map fw.iommu_domain which is already unmapped during I guess you want to say "to unmap iommu domain which is already unmapped" ? > shutdown. This is causing NULL pointer dereference crash. > > This case is handled by adding necessary checks. > > Call trace: > __iommu_map+0x4c/0x348 > iommu_map+0x5c/0x70 > venus_boot+0x184/0x230 [venus_core] > venus_sys_error_handler+0xa0/0x14c [venus_core] > process_one_work+0x210/0x3d0 > worker_thread+0x248/0x3f4 > kthread+0x11c/0x12c > ret_from_fork+0x10/0x18 > > Signed-off-by: Mansur Alisha Shaik > --- > drivers/media/platform/qcom/venus/firmware.c | 17 +++++++++++++---- > 1 file changed, 13 insertions(+), 4 deletions(-) > > diff --git a/drivers/media/platform/qcom/venus/firmware.c b/drivers/media/platform/qcom/venus/firmware.c > index 8801a6a..c427e88 100644 > --- a/drivers/media/platform/qcom/venus/firmware.c > +++ b/drivers/media/platform/qcom/venus/firmware.c > @@ -171,9 +171,14 @@ static int venus_shutdown_no_tz(struct venus_core *core) > > iommu = core->fw.iommu_domain; > > - unmapped = iommu_unmap(iommu, VENUS_FW_START_ADDR, mapped); > - if (unmapped != mapped) > - dev_err(dev, "failed to unmap firmware\n"); > + if (core->fw.mapped_mem_size && iommu) { > + unmapped = iommu_unmap(iommu, VENUS_FW_START_ADDR, mapped); > + > + if (unmapped != mapped) > + dev_err(dev, "failed to unmap firmware\n"); > + else > + core->fw.mapped_mem_size = 0; > + } > > return 0; > } > @@ -288,7 +293,11 @@ void venus_firmware_deinit(struct venus_core *core) > iommu = core->fw.iommu_domain; > > iommu_detach_device(iommu, core->fw.dev); > - iommu_domain_free(iommu); > + > + if (core->fw.iommu_domain) { > + iommu_domain_free(iommu); > + core->fw.iommu_domain = NULL; > + } > > platform_device_unregister(to_platform_device(core->fw.dev)); > } > -- regards, Stan