From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:38129) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMSAq-0003n0-LC for qemu-devel@nongnu.org; Fri, 03 May 2019 03:00:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMSAp-0006EM-L3 for qemu-devel@nongnu.org; Fri, 03 May 2019 03:00:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44610) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hMSAp-0006Dk-Ez for qemu-devel@nongnu.org; Fri, 03 May 2019 02:59:59 -0400 From: Gerd Hoffmann Date: Fri, 3 May 2019 08:59:48 +0200 Message-Id: <20190503065954.17069-2-kraxel@redhat.com> In-Reply-To: <20190503065954.17069-1-kraxel@redhat.com> References: <20190503065954.17069-1-kraxel@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 1/7] usb-mtp: fix string length for filename when writing metadata List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , Aurelien Jarno , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= From: Daniel P. Berrang=C3=A9 The ObjectInfo 'length' field provides the length of the wide character string filename. This is then converted to a multi-byte character string. This may have a different byte count to the wide character string. We should use the C string length of the multi-byte string instead. Signed-off-by: Daniel P. Berrang=C3=A9 Message-id: 20190415154503.6758-2-berrange@redhat.com Signed-off-by: Gerd Hoffmann --- hw/usb/dev-mtp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c index 99548b012d1f..6b7d1296e430 100644 --- a/hw/usb/dev-mtp.c +++ b/hw/usb/dev-mtp.c @@ -1721,7 +1721,7 @@ static void usb_mtp_write_metadata(MTPState *s, uin= t64_t dlen) return; } =20 - o =3D usb_mtp_object_lookup_name(p, filename, dataset->length); + o =3D usb_mtp_object_lookup_name(p, filename, -1); if (o !=3D NULL) { next_handle =3D o->handle; } --=20 2.18.1 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=-6.9 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS autolearn=ham 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 CE662C43219 for ; Fri, 3 May 2019 07:02:22 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A155E205F4 for ; Fri, 3 May 2019 07:02:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A155E205F4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([127.0.0.1]:35643 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMSD7-0005sg-RC for qemu-devel@archiver.kernel.org; Fri, 03 May 2019 03:02:21 -0400 Received: from eggs.gnu.org ([209.51.188.92]:38129) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMSAq-0003n0-LC for qemu-devel@nongnu.org; Fri, 03 May 2019 03:00:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMSAp-0006EM-L3 for qemu-devel@nongnu.org; Fri, 03 May 2019 03:00:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44610) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hMSAp-0006Dk-Ez for qemu-devel@nongnu.org; Fri, 03 May 2019 02:59:59 -0400 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 902A030A769E; Fri, 3 May 2019 06:59:57 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-45.ams2.redhat.com [10.36.116.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0206C5D70A; Fri, 3 May 2019 06:59:54 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 1D5601751C; Fri, 3 May 2019 08:59:54 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Fri, 3 May 2019 08:59:48 +0200 Message-Id: <20190503065954.17069-2-kraxel@redhat.com> In-Reply-To: <20190503065954.17069-1-kraxel@redhat.com> References: <20190503065954.17069-1-kraxel@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" 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.47]); Fri, 03 May 2019 06:59:57 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 1/7] usb-mtp: fix string length for filename when writing metadata 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: Gerd Hoffmann , Aurelien Jarno Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Message-ID: <20190503065948.U2GTcPetMf1JjY124ClIZuhsKDCoedvjiEOOa_iebHc@z> From: Daniel P. Berrang=C3=A9 The ObjectInfo 'length' field provides the length of the wide character string filename. This is then converted to a multi-byte character string. This may have a different byte count to the wide character string. We should use the C string length of the multi-byte string instead. Signed-off-by: Daniel P. Berrang=C3=A9 Message-id: 20190415154503.6758-2-berrange@redhat.com Signed-off-by: Gerd Hoffmann --- hw/usb/dev-mtp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c index 99548b012d1f..6b7d1296e430 100644 --- a/hw/usb/dev-mtp.c +++ b/hw/usb/dev-mtp.c @@ -1721,7 +1721,7 @@ static void usb_mtp_write_metadata(MTPState *s, uin= t64_t dlen) return; } =20 - o =3D usb_mtp_object_lookup_name(p, filename, dataset->length); + o =3D usb_mtp_object_lookup_name(p, filename, -1); if (o !=3D NULL) { next_handle =3D o->handle; } --=20 2.18.1