Message ID | 1516112253-14480-3-git-send-email-pbonzini@redhat.com |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="W4KtLftA"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zLXd46PsLz9s7M for <incoming@patchwork.ozlabs.org>; Wed, 17 Jan 2018 01:28:08 +1100 (AEDT) Received: from localhost ([::1]:39097 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1ebSDe-0002sb-Vw for incoming@patchwork.ozlabs.org; Tue, 16 Jan 2018 09:28:07 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50088) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1ebS3i-0002cU-JW for qemu-devel@nongnu.org; Tue, 16 Jan 2018 09:17:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1ebS3a-0004QA-Oz for qemu-devel@nongnu.org; Tue, 16 Jan 2018 09:17:50 -0500 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:43472) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1ebS3a-0004Ps-Ht for qemu-devel@nongnu.org; Tue, 16 Jan 2018 09:17:42 -0500 Received: by mail-wm0-x242.google.com with SMTP id g1so8671317wmg.2 for <qemu-devel@nongnu.org>; Tue, 16 Jan 2018 06:17:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=Jt0Xhb4SuzYe0b5ia2LvO8eJ8oboIxs2Kr861nHZqow=; b=W4KtLftA2uMupFBYtKUSJT6Tcw4VCUX7/z5jZyQ8BvEKLXEnXGriOeL2JMFWMMfitw mP6uSxnmMw5vrHWuzE92lYVBJtuTtJch+T6pmYhmm0d6hFhGvL+8Qno2ezbX8YK+VfuA qL+OUndvWQ9WTjckJjRVKvTL1f9nYCbVLovHqjFBwUu9K6fqnwVmE3L9PT5x2PAL27rO 5xXM3H70JTOkeh1xhMxG7PJhkGnO5wYsE7Z4D2vwyKFmEQSwRtoA43jyQ4SNtFY4q1OW nxKfwMvJ/PeFTaeYBDrPbn5mLPQgTfygpTJSWYiwbTJAK3p/Yf/yw/4q27kJvM4HwJWW esRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=Jt0Xhb4SuzYe0b5ia2LvO8eJ8oboIxs2Kr861nHZqow=; b=uN80iudaQvrkjV9wCvPjI9IHVbsvbeN/iSc/xnt4XASMKGqxaAaWLPDSA/vQ0sj5Kp QjIV2zSl4WF1j+SSUOaBdtkZK0TgzEH77bbBd7BjcDu4SmUsRya8hWvlCIpBSDniqY1R 0Ez/2L1yIdOgAY64ZWNofGbNNoIZwzHh0yOHPwucegLE1OmVHeO+C3HxNMfz+aSHSFK2 8fwpNDn571ggSCREb403jtGhIERAHJ+2eWE9LK0ivssIJsKrLyv5aWrqNSpUJ0L4AnnE a6MZ4drCvKlcY/kogpuQY5fJPWefIcdC4xVPBt0YwZobBN0AFM1IARRRpdDDLQHH9atC 9qTA== X-Gm-Message-State: AKwxytcXKP0mJEvaEkzDcI1y0CDzulzykpif1rZpxWVzgpry+KtFS4Vd EaDJ5JgP+TsbWz4/kfYhxyCHQ9yN X-Google-Smtp-Source: ACJfBosKVAUIMoH7kMHpa3bfxv8DGZ8Cmrr/kMTmJzU5Po7xUU4gcaJl+6htI+2w8awA6wbACUdA/Q== X-Received: by 10.28.149.17 with SMTP id x17mr5874042wmd.19.1516112260935; Tue, 16 Jan 2018 06:17:40 -0800 (PST) Received: from 640k.lan (dynamic-adsl-78-12-229-84.clienti.tiscali.it. [78.12.229.84]) by smtp.gmail.com with ESMTPSA id u10sm1537758wrg.6.2018.01.16.06.17.39 for <qemu-devel@nongnu.org> (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jan 2018 06:17:39 -0800 (PST) From: Paolo Bonzini <pbonzini@redhat.com> To: qemu-devel@nongnu.org Date: Tue, 16 Jan 2018 15:16:44 +0100 Message-Id: <1516112253-14480-3-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1516112253-14480-1-git-send-email-pbonzini@redhat.com> References: <1516112253-14480-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::242 Subject: [Qemu-devel] [PULL 02/51] scsi: fix scsi_convert_sense crash when in_buf == NULL && in_len == 0 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
[PULL,01/51] scsi-generic: Add share-rw option
|
expand
|
diff --git a/scsi/utils.c b/scsi/utils.c index ddae650..8738522 100644 --- a/scsi/utils.c +++ b/scsi/utils.c @@ -322,18 +322,18 @@ int scsi_convert_sense(uint8_t *in_buf, int in_len, SCSISense sense; bool fixed_in; + if (in_len == 0) { + return scsi_build_sense_buf(buf, len, SENSE_CODE(NO_SENSE), fixed); + } + fixed_in = (in_buf[0] & 2) == 0; - if (in_len && fixed == fixed_in) { + if (fixed == fixed_in) { memcpy(buf, in_buf, MIN(len, in_len)); return MIN(len, in_len); - } - - if (in_len == 0) { - sense = SENSE_CODE(NO_SENSE); } else { sense = scsi_parse_sense_buf(in_buf, in_len); + return scsi_build_sense_buf(buf, len, sense, fixed); } - return scsi_build_sense_buf(buf, len, sense, fixed); } int scsi_sense_to_errno(int key, int asc, int ascq)