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.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,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 E3375C433E5 for ; Fri, 24 Jul 2020 14:12:18 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (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 BADDE2063A for ; Fri, 24 Jul 2020 14:12:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BADDE2063A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.ibm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:33292 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jyyQs-0006SG-1r for qemu-devel@archiver.kernel.org; Fri, 24 Jul 2020 10:12:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41480) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jyyQA-0005fT-Uk for qemu-devel@nongnu.org; Fri, 24 Jul 2020 10:11:34 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:55510 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jyyQ9-0001Nm-2t for qemu-devel@nongnu.org; Fri, 24 Jul 2020 10:11:34 -0400 Received: from pps.filterd (m0098416.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 06OE0kjs158548 for ; Fri, 24 Jul 2020 10:11:31 -0400 Received: from pps.reinject (localhost [127.0.0.1]) by mx0b-001b2d01.pphosted.com with ESMTP id 32fadg5s29-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 24 Jul 2020 10:11:31 -0400 Received: from m0098416.ppops.net (m0098416.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.36/8.16.0.36) with SMTP id 06OE14eB160635 for ; Fri, 24 Jul 2020 10:11:31 -0400 Received: from ppma03dal.us.ibm.com (b.bd.3ea9.ip4.static.sl-reverse.com [169.62.189.11]) by mx0b-001b2d01.pphosted.com with ESMTP id 32fadg5s20-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 24 Jul 2020 10:11:31 -0400 Received: from pps.filterd (ppma03dal.us.ibm.com [127.0.0.1]) by ppma03dal.us.ibm.com (8.16.0.42/8.16.0.42) with SMTP id 06OEAJQU003692; Fri, 24 Jul 2020 14:11:30 GMT Received: from b01cxnp23033.gho.pok.ibm.com (b01cxnp23033.gho.pok.ibm.com [9.57.198.28]) by ppma03dal.us.ibm.com with ESMTP id 32brqaa5by-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 24 Jul 2020 14:11:30 +0000 Received: from b01ledav003.gho.pok.ibm.com (b01ledav003.gho.pok.ibm.com [9.57.199.108]) by b01cxnp23033.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 06OEBTwM14352764 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 24 Jul 2020 14:11:29 GMT Received: from b01ledav003.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 85B2FB2073; Fri, 24 Jul 2020 14:11:29 +0000 (GMT) Received: from b01ledav003.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7567CB205F; Fri, 24 Jul 2020 14:11:29 +0000 (GMT) Received: from sbct-3.pok.ibm.com (unknown [9.47.158.153]) by b01ledav003.gho.pok.ibm.com (Postfix) with ESMTP; Fri, 24 Jul 2020 14:11:29 +0000 (GMT) Subject: Re: [PATCH] tpm_emulator: Report an error if chardev is missing To: Markus Armbruster , Stefan Berger References: <20200724133011.2488055-1-stefanb@linux.vnet.ibm.com> <874kpx9fn2.fsf@dusky.pond.sub.org> From: Stefan Berger Message-ID: <425b6704-5b65-ffd2-ba79-21a249d21f80@linux.ibm.com> Date: Fri, 24 Jul 2020 10:11:29 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.4.1 MIME-Version: 1.0 In-Reply-To: <874kpx9fn2.fsf@dusky.pond.sub.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.235, 18.0.687 definitions=2020-07-24_04:2020-07-24, 2020-07-24 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 priorityscore=1501 spamscore=0 suspectscore=0 mlxscore=0 lowpriorityscore=0 malwarescore=0 phishscore=0 adultscore=0 clxscore=1015 mlxlogscore=999 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2006250000 definitions=main-2007240105 Received-SPF: pass client-ip=148.163.158.5; envelope-from=stefanb@linux.ibm.com; helo=mx0a-001b2d01.pphosted.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/24 10:11:31 X-ACL-Warn: Detected OS = Linux 3.x [generic] X-Spam_score_int: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: marcandre.lureau@redhat.com, philmd@redhat.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 7/24/20 10:00 AM, Markus Armbruster wrote: > Stefan Berger writes: > >> This patch fixes the odd error reporting when trying to send a file >> descriptor to the TPM emulator if one has not passed a valid chardev. >> >> $ x86_64-softmmu/qemu-system-x86_64 -tpmdev emulator,id=tpm0 >> qemu-system-x86_64: -tpmdev emulator,id=tpm0: tpm-emulator: Failed to send CMD_SET_DATAFD: Success >> qemu-system-x86_64: -tpmdev emulator,id=tpm0: tpm-emulator: Could not cleanly shutdown the TPM: Success >> >> This is the new error report: >> >> $ x86_64-softmmu/qemu-system-x86_64 -tpmdev emulator,id=tpm0 >> qemu-system-x86_64: -tpmdev emulator,id=tpm0: tpm-emulator: missing chardev > ~~~~~~~~~~~~~~ > > The "tpm-emulator: " part looks superfluous. > > Hmm, many error messages in this file have it. Feel free to keep it > now for consistency, and clean it up later. > > We usually report missing option parameters like "parameter 'chardev' is > missing". Please consider sticking to that. Fixed. > >> This change does not hide the display of supported TPM types if a non-existent type is passed: >> >> $ x86_64-softmmu/qemu-system-x86_64 -tpmdev nonexistent,id=tpm0 >> qemu-system-x86_64: -tpmdev nonexistent,id=tpm0: Parameter 'type' expects a TPM backend type >> Supported TPM types (choose only one): >> passthrough Passthrough TPM backend driver >> emulator TPM emulator backend driver >> >> Signed-off-by: Stefan Berger >> --- >> backends/tpm/tpm_emulator.c | 8 ++++++++ >> 1 file changed, 8 insertions(+) >> >> diff --git a/backends/tpm/tpm_emulator.c b/backends/tpm/tpm_emulator.c >> index 9605339f93..55cbc9c60e 100644 >> --- a/backends/tpm/tpm_emulator.c >> +++ b/backends/tpm/tpm_emulator.c >> @@ -568,6 +568,9 @@ static int tpm_emulator_handle_device_opts(TPMEmulator *tpm_emu, QemuOpts *opts) >> } >> >> tpm_emu->options->chardev = g_strdup(value); >> + } else { >> + error_report("tpm-emulator: missing chardev"); >> + goto err; >> } >> >> if (tpm_emulator_prepare_data_fd(tpm_emu) < 0) { > This is minimally invasive. > > I'd prefer > > Error *err = NULL; > const char *value; > Chardev *dev; > > value = qemu_opt_get(opts, "chardev"); > if (!value) { > error_report("tpm-emulator: missing chardev"); > goto err; > } > > dev = qemu_chr_find(value); > if (!dev) { > error_report("tpm-emulator: tpm chardev '%s' not found.", value); > goto err; > } > > Your choice. Ok, changed it to this. > >> @@ -925,6 +928,11 @@ static void tpm_emulator_shutdown(TPMEmulator *tpm_emu) >> { >> ptm_res res; >> >> + if (!tpm_emu->options->chardev) { >> + /* was never properly initialized */ >> + return; >> + } >> + > Is this still reachable? If yes, how? tpm_emulator_inst_finalize still runs. Sending V2. Thanks. > > If not, drop the hunk and have my > Reviewed-by: Markus Armbruster > >> if (tpm_emulator_ctrlcmd(tpm_emu, CMD_SHUTDOWN, &res, 0, sizeof(res)) < 0) { >> error_report("tpm-emulator: Could not cleanly shutdown the TPM: %s", >> strerror(errno));