From patchwork Thu Jan 4 02:42:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 10143803 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 17B7B601A1 for ; Thu, 4 Jan 2018 02:43:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 041322950C for ; Thu, 4 Jan 2018 02:43:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EA2532951A; Thu, 4 Jan 2018 02:43:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3D3652950C for ; Thu, 4 Jan 2018 02:43:25 +0000 (UTC) Received: from localhost ([::1]:46625 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWvV6-0002qJ-Sh for patchwork-qemu-devel@patchwork.kernel.org; Wed, 03 Jan 2018 21:43:24 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50282) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWvUR-0002I8-Dm for qemu-devel@nongnu.org; Wed, 03 Jan 2018 21:42:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWvUQ-0000sq-LZ for qemu-devel@nongnu.org; Wed, 03 Jan 2018 21:42:43 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48202) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eWvUM-0000nu-FN; Wed, 03 Jan 2018 21:42:38 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6463C8046A; Thu, 4 Jan 2018 02:42:37 +0000 (UTC) Received: from lemon.usersys.redhat.com (ovpn-12-44.pek2.redhat.com [10.72.12.44]) by smtp.corp.redhat.com (Postfix) with ESMTP id E24445EE1C; Thu, 4 Jan 2018 02:42:32 +0000 (UTC) From: Fam Zheng To: qemu-devel@nongnu.org Date: Thu, 4 Jan 2018 10:42:28 +0800 Message-Id: <20180104024228.11780-1-famz@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 04 Jan 2018 02:42:37 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] scsi: Don't deference in_buf if NULL X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Fam Zheng , qemu-block@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP scsi_disk_emulate_command passes in_buf=NULL and in_len=0 in the REQUEST_SENSE branch. Inline the fixed_in evaluation and put it after the in_len test. Signed-off-by: Fam Zheng Tested-by: Anthoine Bourgeois --- scsi/utils.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scsi/utils.c b/scsi/utils.c index ddae650a99..9a0a925ef9 100644 --- a/scsi/utils.c +++ b/scsi/utils.c @@ -320,10 +320,8 @@ int scsi_convert_sense(uint8_t *in_buf, int in_len, uint8_t *buf, int len, bool fixed) { SCSISense sense; - bool fixed_in; - fixed_in = (in_buf[0] & 2) == 0; - if (in_len && fixed == fixed_in) { + if (in_len && !!fixed == ((in_buf[0] & 2) == 0)) { memcpy(buf, in_buf, MIN(len, in_len)); return MIN(len, in_len); }