From nobody Sun May 19 07:31:52 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1594983378; cv=none; d=zohomail.com; s=zohoarc; b=d/SRzBdanVYtmzQnF3YZxVgi3sScJMnTKni2geoBRIUwdu38Q/OlY4ZBjZat7w16Izr6mZV0Z8L7gv+/BrtkP+b/qPy0l66tYLWqBpZDHJPG/2v4WoG3JRg0IXUevu4AF8ZrEQYSBe40pC9vR4aQdpM9VxYrQ4JyDY5I3kdek+Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594983378; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=5q8KKnBbLZd3LytN1YBSNWa8Cu5XHVk6GiVEfo4dW5M=; b=k2bNR2IjllFwbTeHZj81H0dTYniabX2Au5YCy+Lx8tCooYSN/iSoRIv/7A6AZZGao0WiMQq/jQmehfmihRLMqUYW9K+l6clHwyYKFqFGz0tKrDqHUkdaePddVg2jHyKrdyIxFF/asSfTQmOm329PU1abUxxGhYcM6ULlxzE9X4U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1594983378089125.20098777122541; Fri, 17 Jul 2020 03:56:18 -0700 (PDT) Received: from localhost ([::1]:54918 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jwO2K-0003xz-Q3 for importer@patchew.org; Fri, 17 Jul 2020 06:56:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44856) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jwO0j-0001DD-Qv for qemu-devel@nongnu.org; Fri, 17 Jul 2020 06:54:37 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:39643 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jwO0g-0004QB-HA for qemu-devel@nongnu.org; Fri, 17 Jul 2020 06:54:37 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-393-NxG8R6hEOfaiM5XWk0SU5A-1; Fri, 17 Jul 2020 06:54:32 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 159F38015CE; Fri, 17 Jul 2020 10:54:31 +0000 (UTC) Received: from linux.fritz.box.com (ovpn-113-80.ams2.redhat.com [10.36.113.80]) by smtp.corp.redhat.com (Postfix) with ESMTP id EFF8075554; Fri, 17 Jul 2020 10:54:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594983273; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5q8KKnBbLZd3LytN1YBSNWa8Cu5XHVk6GiVEfo4dW5M=; b=dRAAqnD8hR1GOc+PcawLxRik9WnyrmQgNrmSO5F+5HJOKRWqAIRK5QGHTHqq/BroQ6qGTe twFX1Uqsu9rpfKJOA4PvemsR/+BGevowjIXFnWcGZxuJFYPKcwSH9Lwf+fgPlqZyaq5xyS v5vUIK1BhY74A2oXQv6jSSvu3o0XJ9g= X-MC-Unique: NxG8R6hEOfaiM5XWk0SU5A-1 From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PATCH for-5.1 1/3] file-posix: Move check_hdev_writable() up Date: Fri, 17 Jul 2020 12:54:24 +0200 Message-Id: <20200717105426.51134-2-kwolf@redhat.com> In-Reply-To: <20200717105426.51134-1-kwolf@redhat.com> References: <20200717105426.51134-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=207.211.31.120; envelope-from=kwolf@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/17 03:33:51 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: kwolf@redhat.com, qemu-devel@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" We'll need to call it in raw_open_common(), so move the function to avoid a forward declaration. Signed-off-by: Kevin Wolf Reviewed-by: Max Reitz --- block/file-posix.c | 66 +++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/block/file-posix.c b/block/file-posix.c index 8067e238cb..e35e15185a 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -401,6 +401,39 @@ static void raw_probe_alignment(BlockDriverState *bs, = int fd, Error **errp) } } =20 +static int check_hdev_writable(BDRVRawState *s) +{ +#if defined(BLKROGET) + /* Linux block devices can be configured "read-only" using blockdev(8). + * This is independent of device node permissions and therefore open(2) + * with O_RDWR succeeds. Actual writes fail with EPERM. + * + * bdrv_open() is supposed to fail if the disk is read-only. Explicit= ly + * check for read-only block devices so that Linux block devices behave + * properly. + */ + struct stat st; + int readonly =3D 0; + + if (fstat(s->fd, &st)) { + return -errno; + } + + if (!S_ISBLK(st.st_mode)) { + return 0; + } + + if (ioctl(s->fd, BLKROGET, &readonly) < 0) { + return -errno; + } + + if (readonly) { + return -EACCES; + } +#endif /* defined(BLKROGET) */ + return 0; +} + static void raw_parse_flags(int bdrv_flags, int *open_flags, bool has_writ= ers) { bool read_write =3D false; @@ -3299,39 +3332,6 @@ static int hdev_probe_device(const char *filename) return 0; } =20 -static int check_hdev_writable(BDRVRawState *s) -{ -#if defined(BLKROGET) - /* Linux block devices can be configured "read-only" using blockdev(8). - * This is independent of device node permissions and therefore open(2) - * with O_RDWR succeeds. Actual writes fail with EPERM. - * - * bdrv_open() is supposed to fail if the disk is read-only. Explicit= ly - * check for read-only block devices so that Linux block devices behave - * properly. - */ - struct stat st; - int readonly =3D 0; - - if (fstat(s->fd, &st)) { - return -errno; - } - - if (!S_ISBLK(st.st_mode)) { - return 0; - } - - if (ioctl(s->fd, BLKROGET, &readonly) < 0) { - return -errno; - } - - if (readonly) { - return -EACCES; - } -#endif /* defined(BLKROGET) */ - return 0; -} - static void hdev_parse_filename(const char *filename, QDict *options, Error **errp) { --=20 2.25.4 From nobody Sun May 19 07:31:52 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1594983476; cv=none; d=zohomail.com; s=zohoarc; b=i11KSTWLbTpwIKRUuU6Ury5nCkGjWf7AiR84wROr0j+lvZoxXIzJvhfB2hbipI0L2s7A1XyU/PwwC8vRPzHkP71ggs7MQ5YVNqLstNsT7IS5/Z9zA8SZZNkxu1rMy2TYcyvcdDmyxVd+lCHIu8uJLwEu3v4WogWb6aZB1M1jNPw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594983476; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=WNBvx4THG0M9pR8FSX6Ps6fHmdrKHB/so8DozTyNlvw=; b=JGY1M+rf4sm3d+f8Ho3lMobo5hRqgQJpDa/F+yRxVheq5VufpdmQC9BMfE42wDbhcVBHZPL20H55Y3frTrXD+Djzb/DVAPZKzNs0vdsGAYMORRmdmSeBb8Ofq1U8GSsRdpSEHUXsNsV8EkhmGBQQz6dmhZhOofwklrjU0NsrLXI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1594983476819288.73429011791256; Fri, 17 Jul 2020 03:57:56 -0700 (PDT) Received: from localhost ([::1]:33538 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jwO3v-0006ow-Is for importer@patchew.org; Fri, 17 Jul 2020 06:57:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44888) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jwO0m-0001Kj-NT for qemu-devel@nongnu.org; Fri, 17 Jul 2020 06:54:40 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:51620 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jwO0k-0004RQ-Sb for qemu-devel@nongnu.org; Fri, 17 Jul 2020 06:54:40 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-181-NLdMEcwnOCunYQJuxnjR3Q-1; Fri, 17 Jul 2020 06:54:36 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7ED5F100CCC1; Fri, 17 Jul 2020 10:54:35 +0000 (UTC) Received: from linux.fritz.box.com (ovpn-113-80.ams2.redhat.com [10.36.113.80]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5C5246FED1; Fri, 17 Jul 2020 10:54:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594983278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WNBvx4THG0M9pR8FSX6Ps6fHmdrKHB/so8DozTyNlvw=; b=KPrcLxfkqsJlO7o5wyzQEX+9Exg87IpoYGHF3eArwNNOGuz3F5oL2OOo8KH1Qw6A/dclMe X9MS5uUHKCOY6DerufzYZ/6CwVFCoSbkzibWraLnQZ6O5+NmxcyZci/9c+7NAlG/rc1mUu Trg3DRmRQLjx/FPwSuFIzKpBKk4mb24= X-MC-Unique: NLdMEcwnOCunYQJuxnjR3Q-1 From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PATCH for-5.1 2/3] file-posix: Fix check_hdev_writable() with auto-read-only Date: Fri, 17 Jul 2020 12:54:25 +0200 Message-Id: <20200717105426.51134-3-kwolf@redhat.com> In-Reply-To: <20200717105426.51134-1-kwolf@redhat.com> References: <20200717105426.51134-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=207.211.31.81; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/17 05:27:47 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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: kwolf@redhat.com, qemu-devel@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" For Linux block devices, being able to open the device read-write doesn't necessarily mean that the device is actually writable (one example is a read-only LV, as you get with lvchange -pr ). We have check_hdev_writable() to check this condition and fail opening the image read-write if it's not actually writable. However, this check doesn't take auto-read-only into account, but results in a hard failure instead of downgrading to read-only where possible. Fix this and do the writable check not based on BDRV_O_RDWR, but only when this actually results in opening the file read-write. A second check is inserted in raw_reconfigure_getfd() to have the same check when dynamic auto-read-only upgrades an image file from read-only to read-write. Signed-off-by: Kevin Wolf Reviewed-by: Max Reitz --- block/file-posix.c | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/block/file-posix.c b/block/file-posix.c index e35e15185a..659f780570 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -401,7 +401,7 @@ static void raw_probe_alignment(BlockDriverState *bs, i= nt fd, Error **errp) } } =20 -static int check_hdev_writable(BDRVRawState *s) +static int check_hdev_writable(int fd) { #if defined(BLKROGET) /* Linux block devices can be configured "read-only" using blockdev(8). @@ -415,7 +415,7 @@ static int check_hdev_writable(BDRVRawState *s) struct stat st; int readonly =3D 0; =20 - if (fstat(s->fd, &st)) { + if (fstat(fd, &st)) { return -errno; } =20 @@ -423,7 +423,7 @@ static int check_hdev_writable(BDRVRawState *s) return 0; } =20 - if (ioctl(s->fd, BLKROGET, &readonly) < 0) { + if (ioctl(fd, BLKROGET, &readonly) < 0) { return -errno; } =20 @@ -618,6 +618,15 @@ static int raw_open_common(BlockDriverState *bs, QDict= *options, } s->fd =3D fd; =20 + /* Check s->open_flags rather than bdrv_flags due to auto-read-only */ + if (s->open_flags & O_RDWR) { + ret =3D check_hdev_writable(s->fd); + if (ret < 0) { + error_setg_errno(errp, -ret, "The device is not writable"); + goto fail; + } + } + s->perm =3D 0; s->shared_perm =3D BLK_PERM_ALL; =20 @@ -1010,6 +1019,15 @@ static int raw_reconfigure_getfd(BlockDriverState *b= s, int flags, } } =20 + if (fd !=3D -1 && (*open_flags & O_RDWR)) { + ret =3D check_hdev_writable(fd); + if (ret < 0) { + qemu_close(fd); + error_setg_errno(errp, -ret, "The device is not writable"); + return -1; + } + } + return fd; } =20 @@ -3454,15 +3472,6 @@ hdev_open_Mac_error: /* Since this does ioctl the device must be already opened */ bs->sg =3D hdev_is_sg(bs); =20 - if (flags & BDRV_O_RDWR) { - ret =3D check_hdev_writable(s); - if (ret < 0) { - raw_close(bs); - error_setg_errno(errp, -ret, "The device is not writable"); - return ret; - } - } - return ret; } =20 --=20 2.25.4 From nobody Sun May 19 07:31:52 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1594983487; cv=none; d=zohomail.com; s=zohoarc; b=f6+Ln97RsoAQUh66vj2pHu5Kq9sJc0HIIf3VHluam3vEq46bktPvkApX40/qzi6wgxT07TFuVOTobZf8r+Qee1bRvl0ap84g3dqNFVQ0dC1CmQl4zGK5abB/hjhrP1fu1V68/eTGOMCRe8eYRrAZ4TcqtAGbxNtNEL+wQkGxzEI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594983487; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=YS8LID4pdMqe3cFHW+uHJoMP+wERKy7cl5zNWXXEbpY=; b=B/3o+uUQ9nIV4nynEgzFSJfxvGJKhKGWdN7oqS4wlwFfZw6FRXPxNF8Uz8NnL6fbbnvVJzAOtzvG9KABLPI5Y2RYr8+Z6yQN7U/sfRwwTuahM0Ijt+uL6W7lIzxMzOMUWyX78J7RHZIxH26Qr+8MNECkrJrGvVtAU5BWMFs6mo0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1594983487772457.1025378556137; Fri, 17 Jul 2020 03:58:07 -0700 (PDT) Received: from localhost ([::1]:34268 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jwO46-00076s-LT for importer@patchew.org; Fri, 17 Jul 2020 06:58:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44930) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jwO0o-0001Pu-IV for qemu-devel@nongnu.org; Fri, 17 Jul 2020 06:54:42 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:36912 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jwO0m-0004Sf-SK for qemu-devel@nongnu.org; Fri, 17 Jul 2020 06:54:42 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-244-qlibcSbwNZWqG1RSLcXCpA-1; Fri, 17 Jul 2020 06:54:37 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DE3BA1888AB0; Fri, 17 Jul 2020 10:54:36 +0000 (UTC) Received: from linux.fritz.box.com (ovpn-113-80.ams2.redhat.com [10.36.113.80]) by smtp.corp.redhat.com (Postfix) with ESMTP id C52106FED1; Fri, 17 Jul 2020 10:54:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594983279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YS8LID4pdMqe3cFHW+uHJoMP+wERKy7cl5zNWXXEbpY=; b=ZiQHJtjyN/O9VNls+uo0q3gPA5a45vWNSLOCZRxdQiKqLxwp7lc5y2OtVxKqyUkG6LV7hB Ah7rjRDrDiBpOmHQ+kcpbHu8u3DtXnJkQMGDkIMjFCUhzP4I56itW79PvnxCEIdAnYLBHr LDuhimAFoTc1TgmmNDdjxXyeFF1B7E8= X-MC-Unique: qlibcSbwNZWqG1RSLcXCpA-1 From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PATCH for-5.1 3/3] file-posix: Fix leaked fd in raw_open_common() error path Date: Fri, 17 Jul 2020 12:54:26 +0200 Message-Id: <20200717105426.51134-4-kwolf@redhat.com> In-Reply-To: <20200717105426.51134-1-kwolf@redhat.com> References: <20200717105426.51134-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=205.139.110.61; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/17 01:33:03 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: kwolf@redhat.com, qemu-devel@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Signed-off-by: Kevin Wolf Reviewed-by: Max Reitz --- block/file-posix.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/block/file-posix.c b/block/file-posix.c index 659f780570..b2ed9d7eb2 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -749,6 +749,9 @@ static int raw_open_common(BlockDriverState *bs, QDict = *options, } ret =3D 0; fail: + if (ret < 0 && s->fd !=3D -1) { + qemu_close(s->fd); + } if (filename && (bdrv_flags & BDRV_O_TEMPORARY)) { unlink(filename); } --=20 2.25.4