From patchwork Sun Jan 22 15:49:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rix X-Patchwork-Id: 13111516 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 26201C25B4E for ; Sun, 22 Jan 2023 15:49:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230287AbjAVPt4 (ORCPT ); Sun, 22 Jan 2023 10:49:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37878 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230255AbjAVPt4 (ORCPT ); Sun, 22 Jan 2023 10:49:56 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6D33C1ABF2 for ; Sun, 22 Jan 2023 07:49:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1674402548; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=DFbyoejAIdnfrNzW5cK4QSeXywphc6GIMI0C0e0eVJM=; b=CbU8lL3TaKYuXqAw40foTB/pCjJw694idVIJbmX6YnzRkLLbCJcQQZIWmi95C7nDObjCdv 0PjpSqltHZsmaOLAidL3Ir25ML5p4jtUYO3wGE8J33PsZX5fRCYUZZkU9eGCgI4UzResmr xP+ktaJDz+tMQ0YAecsG1M8pQNShLCw= Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-178-DEoVQ4eMPV6XZpREqxpGQQ-1; Sun, 22 Jan 2023 10:49:07 -0500 X-MC-Unique: DEoVQ4eMPV6XZpREqxpGQQ-1 Received: by mail-qk1-f197.google.com with SMTP id x12-20020a05620a258c00b007051ae500a2so7215651qko.15 for ; Sun, 22 Jan 2023 07:49:07 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=DFbyoejAIdnfrNzW5cK4QSeXywphc6GIMI0C0e0eVJM=; b=MP71LPHVdiRtnHixzhuhFO466pvna/df+cFIqLVjmUVD8Icyq0DfkjVSRPSizBFqZZ 73bvawcAyL5EGfFj/5lXQmWMY1l4sRYMpf8LuPkYcfQBp4s7KjR86SPwFWe96NWFkBwQ gsQI4otTR+ldWkWusqxuRW3e+0dWRprvaAS/cLUGOIY+9NK126wq1o8Sr87EgNpOnJUh xUIBhseEkzN7ZMVPsWOVT4bEmqdBt1AIQ118LhQuNzAO7VvPse1KqVItxXSqVNkbTpE2 yZh9QywpQD4nUS+jL0dpUs62XP8GgD9oewaDAv16yuWizRFZ9WUE8YedwO7g8jiAxhi+ b9fw== X-Gm-Message-State: AFqh2kqs5LQZyigHcslwJcKngmaZVJddhcA0UiOk+9Ly9r+6Rh7ndwCN jDfXzTRURO9umolXJK1VICAb4mw/CIdFgSV0qN9fsCobJdW44RliWSElps7waNul54D/HW1ohQF b/Bqr2g2N+TiVeNn16nUQyTY= X-Received: by 2002:a05:622a:5d86:b0:3b6:301f:7b3d with SMTP id fu6-20020a05622a5d8600b003b6301f7b3dmr30207698qtb.65.1674402546790; Sun, 22 Jan 2023 07:49:06 -0800 (PST) X-Google-Smtp-Source: AMrXdXtNrJUlEZmoEfpchm9hSMxWlPveAw9LrPSEM9CMrsFLIBcI3fydh1ltFEimuIOjLGnPmhMnKg== X-Received: by 2002:a05:622a:5d86:b0:3b6:301f:7b3d with SMTP id fu6-20020a05622a5d8600b003b6301f7b3dmr30207677qtb.65.1674402546486; Sun, 22 Jan 2023 07:49:06 -0800 (PST) Received: from localhost.localdomain.com (024-205-208-113.res.spectrum.com. [24.205.208.113]) by smtp.gmail.com with ESMTPSA id h8-20020a05620a284800b006fa7b5ea2d1sm29932207qkp.125.2023.01.22.07.49.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Jan 2023 07:49:06 -0800 (PST) From: Tom Rix To: tim@cyberelk.net, axboe@kernel.dk, nathan@kernel.org, ndesaulniers@google.com Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, llvm@lists.linux.dev, Tom Rix Subject: [PATCH v2] paride/pcd: return earlier when an error happens in pcd_atapi() Date: Sun, 22 Jan 2023 07:49:01 -0800 Message-Id: <20230122154901.505142-1-trix@redhat.com> X-Mailer: git-send-email 2.26.3 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org clang static analysis reports drivers/block/paride/pcd.c:856:36: warning: The left operand of '&' is a garbage value [core.UndefinedBinaryOperatorResult] tocentry->cdte_ctrl = buffer[5] & 0xf; ~~~~~~~~~ ^ When the call to pcd_atapi() fails, buffer[] is in an unknown state, so return early. Signed-off-by: Tom Rix --- v2: remove unused 'r' variable --- drivers/block/paride/pcd.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/block/paride/pcd.c b/drivers/block/paride/pcd.c index a5ab40784119..47757ba1a09f 100644 --- a/drivers/block/paride/pcd.c +++ b/drivers/block/paride/pcd.c @@ -825,14 +825,14 @@ static int pcd_audio_ioctl(struct cdrom_device_info *cdi, unsigned int cmd, void struct cdrom_tochdr *tochdr = (struct cdrom_tochdr *) arg; char buffer[32]; - int r; - r = pcd_atapi(cd, cmd, 12, buffer, "read toc header"); + if (pcd_atapi(cd, cmd, 12, buffer, "read toc header")) + return -EIO; tochdr->cdth_trk0 = buffer[2]; tochdr->cdth_trk1 = buffer[3]; - return r ? -EIO : 0; + return 0; } case CDROMREADTOCENTRY: @@ -845,13 +845,13 @@ static int pcd_audio_ioctl(struct cdrom_device_info *cdi, unsigned int cmd, void struct cdrom_tocentry *tocentry = (struct cdrom_tocentry *) arg; unsigned char buffer[32]; - int r; cmd[1] = (tocentry->cdte_format == CDROM_MSF ? 0x02 : 0); cmd[6] = tocentry->cdte_track; - r = pcd_atapi(cd, cmd, 12, buffer, "read toc entry"); + if (pcd_atapi(cd, cmd, 12, buffer, "read toc entry")) + return -EIO; tocentry->cdte_ctrl = buffer[5] & 0xf; tocentry->cdte_adr = buffer[5] >> 4; @@ -866,7 +866,7 @@ static int pcd_audio_ioctl(struct cdrom_device_info *cdi, unsigned int cmd, void (((((buffer[8] << 8) + buffer[9]) << 8) + buffer[10]) << 8) + buffer[11]; - return r ? -EIO : 0; + return 0; } default: