From patchwork Sat Mar 6 13:22:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jia-Ju Bai X-Patchwork-Id: 12119985 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=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham 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 2DE2CC433E0 for ; Sat, 6 Mar 2021 13:26:05 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A042A64FEF for ; Sat, 6 Mar 2021 13:26:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A042A64FEF Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:MIME-Version:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Message-Id:Date:Subject:Cc:To:From:Reply-To: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=B/21aY19lwpVJPurduiOnLBL2ZD3tLRXzYoohd/boi8=; b=P1Ko0sMoFmvOZ29Hunyzw2B9Rr Yd6tyF8mKyi3yo84Wc4vC79HA9IMAZQ7GtOEiUgiF3EcctUiwiUS+CoWG2zvDoUo/ARMCBA+4gFWG NMhJi0MXNccB2fCshHAwX8I8SwlmcozJipiYMvmmTg614ylN7UKoU6YvM3PjKWlY8uU/kGTSvKgG1 JjIOSuznazjN5aD80tV/8foJWLFlolERq5mh3X27kPYfij9rnqIjVLqdzz7jjyh8qw5+PZ2OSZz9+ hiFtkp4NA0PgT8HjW5C13N1I7Hd5hiZVetEpI7RiiJfwp0LV/hJrWtZCn5ay9QL0Qxoi4GGSdW4WV QWEI1qTQ==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lIWuJ-0037Pn-Un; Sat, 06 Mar 2021 13:23:48 +0000 Received: from mail-pf1-x42b.google.com ([2607:f8b0:4864:20::42b]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lIWuC-0037On-Sp; Sat, 06 Mar 2021 13:23:43 +0000 Received: by mail-pf1-x42b.google.com with SMTP id r5so3970527pfh.13; Sat, 06 Mar 2021 05:23:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=QNie7fvacg0VcMhJUcIkQPujOIJJT3GPp44PryGFraY=; b=ZsSwrn2q6uVcmRI4L15LCpuu4OkwZCBLAt3XsMRWKPvxSEYMnpHxcC7SqeIMi7E+Nk Ll2WgneSd9qFq/aARfpAFiyMqFRb5Mi6F5y8wUQLNAr2/EnW1MWBCWNf+jie8pDiJ10y S6IXVOFUOweMyB1aq2WdB0P3zgvoehcKyhxYbKJTKrmi1qtKTF4laUYHLbLJV7fB/frq v57hn/dMwo/LChiM5RNqfGww5xRZ33Xdz9nv4TakWeErcJjrekiS/U6DYbXDeElzPtN5 CYiVseQpB3ukpnD3khsvwtCCMCqupNKpvRRbqCtdw1tbZgN1yQMf93YBzNk/U0+OXybq 8hhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=QNie7fvacg0VcMhJUcIkQPujOIJJT3GPp44PryGFraY=; b=JQruKGXzD6/a3e8pL87mQKrPldHQv6IECKh20UFRHUOP2v1dDx7vgIZmCj6ZR+WSKI OCreWD3gh1PBeWVG4EaMoyh7dHsHLsSvvfOiz1lNG/6SpJHw0/U5sa3MpOFq413vQZAn C65WzQ8/KaCQCOK5ou6CQqAC5yT4fEMWF9nbqmKmKPCa/JKrsRbPSj0Wwwzur5zC1cG8 HGSgimuy4E4P5v/UqAU3+pddxOjpmrl/DmRaulzNZIIgfdjv6VFsKoTWbzlHkLzpoclZ s/UBziaeoPqGFnYfN0JTiTHdxsBHCYXao3oCCHlVsr/sTnWQGjwO6PNO39SUtmhvm3GC XXZA== X-Gm-Message-State: AOAM530+cKRkKk4cftfnTDn/9ayv2ugNB57ZKW+MWcqSdWfC+O0CgFtk E6hoj0746c+Ie2mP8h4+w60= X-Google-Smtp-Source: ABdhPJxzeo+9H4+p0uAsSY2mO7pJES8TJr7rANuMY+Kq3XAv2Qz8x68JaHIM9oiVv9/CGktzV7yyuw== X-Received: by 2002:a65:4243:: with SMTP id d3mr13351432pgq.180.1615037016632; Sat, 06 Mar 2021 05:23:36 -0800 (PST) Received: from localhost.localdomain ([45.135.186.66]) by smtp.gmail.com with ESMTPSA id d24sm5672441pfn.54.2021.03.06.05.23.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Mar 2021 05:23:36 -0800 (PST) From: Jia-Ju Bai To: nsaenzjulienne@suse.de, gregkh@linuxfoundation.org, arnd@arndb.de, dan.carpenter@oracle.com, phil@raspberrypi.com, amarjargal16@gmail.com Cc: bcm-kernel-feedback-list@broadcom.com, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Jia-Ju Bai Subject: [PATCH] staging: vc04_services: vchiq_arm: fix error return code of vchiq_release_internal() and vchiq_use_internal() Date: Sat, 6 Mar 2021 05:22:45 -0800 Message-Id: <20210306132245.16811-1-baijiaju1990@gmail.com> X-Mailer: git-send-email 2.17.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210306_132341_108748_6B274037 X-CRM114-Status: UNSURE ( 9.11 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org When arm_state is NULL, no error return code of vchiq_release_internal() and vchiq_use_internal() is assigned. To fix this bug, ret is assigned with VCHIQ_ERROR. Reported-by: TOTE Robot Signed-off-by: Jia-Ju Bai --- .../staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c index 59e45dc03a97..8b2b4771f420 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c @@ -2332,8 +2332,10 @@ vchiq_use_internal(struct vchiq_state *state, struct vchiq_service *service, int *entity_uc; int local_uc; - if (!arm_state) + if (!arm_state) { + ret = VCHIQ_ERROR; goto out; + } vchiq_log_trace(vchiq_susp_log_level, "%s", __func__); @@ -2389,8 +2391,10 @@ vchiq_release_internal(struct vchiq_state *state, struct vchiq_service *service) char entity[16]; int *entity_uc; - if (!arm_state) + if (!arm_state) { + ret = VCHIQ_ERROR; goto out; + } vchiq_log_trace(vchiq_susp_log_level, "%s", __func__);