From nobody Sun Feb 8 06:58:31 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1604314636; cv=none; d=zohomail.com; s=zohoarc; b=iWX34ypEaLZYExWPh3r5MRDajWB1/0etXLgac4MEfqhDEIvJwLYvKbiztfjCwYAx2ub4dDaRH1loCDJs4BAYNwxG0eWjmmKkUYX//zKRIJvJmNtwMT5r278mStdFFlSCc+mxxFHQy9VRKu7V3CSyBgQw540AS6JOpwwCXms+FzY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604314636; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=JOOQn/lRYc/LBUDk5v31RdhWu5KK8V0FqB2IyTB/tHo=; b=BPlBj+qeLCmHse3drBZL64HE8r2sIezgtG0H4JHNOUKKMdD5pmZmfNFVwz3wwhAJFw389aUs3WC9G5UR1Vompzr3qlyZG9FfWxY0GqX06yPIo12bna/o3bxAHMMBWMfZ65WNHbNS5V6LBvLu9XeH9orVWXAOYNw/8wvu4meYmyY= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1604314636570269.6700163125662; Mon, 2 Nov 2020 02:57:16 -0800 (PST) Received: from localhost ([::1]:45804 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kZXWV-0006d8-0y for importer@patchew.org; Mon, 02 Nov 2020 05:57:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37372) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kZXVU-0005t1-VX; Mon, 02 Nov 2020 05:56:12 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:2428) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kZXVP-00060b-Gx; Mon, 02 Nov 2020 05:56:12 -0500 Received: from DGGEMS407-HUB.china.huawei.com (unknown [172.30.72.58]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4CPqZx0CN6zLq9J; Mon, 2 Nov 2020 18:55:53 +0800 (CST) Received: from [10.174.187.138] (10.174.187.138) by DGGEMS407-HUB.china.huawei.com (10.3.19.207) with Microsoft SMTP Server id 14.3.487.0; Mon, 2 Nov 2020 18:55:53 +0800 Message-ID: <5F9FE5B8.1030803@huawei.com> Date: Mon, 2 Nov 2020 18:55:52 +0800 From: AlexChen User-Agent: Mozilla/5.0 (Windows NT 6.2; WOW64; rv:17.0) Gecko/20130509 Thunderbird/17.0.6 MIME-Version: 1.0 To: Peter Maydell , Michael Tokarev Subject: [PATCH V2] util: Remove redundant checks in the openpty() Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.174.187.138] X-CFilter-Loop: Reflected Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=45.249.212.191; envelope-from=alex.chen@huawei.com; helo=szxga05-in.huawei.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/02 04:55:35 X-ACL-Warn: Detected OS = Linux 3.1-3.10 [fuzzy] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, 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: QEMU Trivial , QEMU Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" As we can see from the following function call stack, amaster and aslave can not be NULL: char_pty_open() -> qemu_openpty_raw() -> openpty(). In addition, according to the API specification for openpty(): https://www.gnu.org/software/libc/manual/html_node/Pseudo_002dTerminal-Pair= s.html, the arguments name, termp and winp can all be NULL, but arguments amaster o= r aslave can not be NULL. Finally, amaster and aslave has been dereferenced at the beginning of the o= penpty(). So the checks on amaster and aslave in the openpty() are redundant. Remove = them. Reported-by: Euler Robot Signed-off-by: Alex Chen Reviewed-by: Peter Maydell --- util/qemu-openpty.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/util/qemu-openpty.c b/util/qemu-openpty.c index eb17f5b0bc..427f43a769 100644 --- a/util/qemu-openpty.c +++ b/util/qemu-openpty.c @@ -80,10 +80,9 @@ static int openpty(int *amaster, int *aslave, char *name, (termp !=3D NULL && tcgetattr(sfd, termp) < 0)) goto err; - if (amaster) - *amaster =3D mfd; - if (aslave) - *aslave =3D sfd; + *amaster =3D mfd; + *aslave =3D sfd; + if (winp) ioctl(sfd, TIOCSWINSZ, winp); --=20 2.19.1