From nobody Sat May 18 19:24:32 2024 Delivered-To: importer@patchew.org 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; 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=1586451238; cv=none; d=zohomail.com; s=zohoarc; b=P6Fvq8Zuzn5biqyYo+reld7vzTnTQ7C60pnDXi7+e8qudnVOspDQ7rabheXiBclDtyuud+/FII1YY+wH4Eh2uEks2wuzF+pXMNCYHLgfkMGGI6XwdlRCjTMj2K+eljiTsSJ9VZhOcAKCN1EWoRxs8x6Pjkdi8DfnbmctvG0wDPk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1586451238; 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=83VDjDS4t7UbAcIlk5RNPhROXasu3MLja0CFwm1jYMc=; b=CrviDoGu/qd4Zu9bPv9kyf5eke3hJWhrdXv0Temr6ndND61Bs8IfnIiwaRQ1nS1qfrtgOvkcgn6S6q9pvMFNdet9iEmItQHXtTIel+dqEKIPpajWDpaKaPVmnmjhfFRVBiFqDlCU8TsgQUEboJGPrwd2wpO3zwcdkgmgGx69HXM= 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 1586451238104775.4083966292862; Thu, 9 Apr 2020 09:53:58 -0700 (PDT) Received: from localhost ([::1]:52766 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jMaR8-0006Ug-V0 for importer@patchew.org; Thu, 09 Apr 2020 12:53:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59382) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jMaNY-00040S-WF for qemu-devel@nongnu.org; Thu, 09 Apr 2020 12:50:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jMaNV-0004Hm-Uh for qemu-devel@nongnu.org; Thu, 09 Apr 2020 12:50:11 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:35055 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jMaNV-0004HQ-RE for qemu-devel@nongnu.org; Thu, 09 Apr 2020 12:50:09 -0400 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-211-g1FpVgIRPHaJEOlnNipopg-1; Thu, 09 Apr 2020 12:50:02 -0400 Received: by mail-wm1-f72.google.com with SMTP id o5so274257wmo.6 for ; Thu, 09 Apr 2020 09:50:02 -0700 (PDT) Received: from xz-x1.redhat.com ([2607:9880:19c0:32::2]) by smtp.gmail.com with ESMTPSA id h2sm3310915wmf.34.2020.04.09.09.49.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Apr 2020 09:50:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1586451008; 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=83VDjDS4t7UbAcIlk5RNPhROXasu3MLja0CFwm1jYMc=; b=YDI1+tB4eSihqeZtuLJdsFbpdSprVm7c4SGLEs9+TQT/+cw+86LhzNN5v2B2H4chEd9FpA RGmeI82j5lfymuF/yPyl/MKBnSnXq+s1iqW2NcnpUqU50XVZ2IyTom7yq7TLRyHh8tS4SZ 9oe9NKzRVsfm21OUm2FEC4PwKt2krts= X-MC-Unique: g1FpVgIRPHaJEOlnNipopg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KbRwcfAlvsMLh5EY7Ycxn7t4bf3uXxDpsBXPo8uidoI=; b=hwjIcZrzbbnyrz+B10NlQOqLciHqFzsEi261LTJb4hsWGqLky7Gr04FG8qvEcezC1B 3zcd5qjZMYy4UMXwFE4qXCjoAQMdW0xJnCCq9bKrDfs0Dh2nUgJl6FhfUhjTHW+DEugM xUBFLEECLXB4m6l0NZjQeE2ZxsXyYydVS37lq639Xm9N25NFabRC4wKCm8J3YS2JfmEn PZL/T7zN/1egGUyP+/eZEHIUGbXpO13TnDXZVHRpKQ3Kiw2hxwAZ2YeYsg9zc5I+3Nbs WX8zYOjuz3+D5zo3MZbtuegiQzy9UVNefQgvZbqYYOX78tCmi97mug8Tn0zFWQU9YJ80 yhKg== X-Gm-Message-State: AGi0PuaV0RaNL7F4306pPqvITkt4pS9FhifEdeSna6AwQcSpkYezMoAj N/la3gTs9DOmFgWJlUjHwIDJf5uULw1J+PVPldrXZ96O2672zJmhaaKKwkSJgKr8LBvfAXIxvru oTqG5JAnfUEvUUhE= X-Received: by 2002:adf:f88b:: with SMTP id u11mr96690wrp.84.1586451001046; Thu, 09 Apr 2020 09:50:01 -0700 (PDT) X-Google-Smtp-Source: APiQypIS9lhqO6UPIH4XeX7RggNPHS5aJK3bmQSHOqa3PfOrmBnW7x3pbkdutt8pp/NoBCm0drlYpw== X-Received: by 2002:adf:f88b:: with SMTP id u11mr96678wrp.84.1586451000892; Thu, 09 Apr 2020 09:50:00 -0700 (PDT) From: Peter Xu To: qemu-devel@nongnu.org Subject: [PATCH 1/2] gdbstub: Assert len read from each register Date: Thu, 9 Apr 2020 12:49:53 -0400 Message-Id: <20200409164954.36902-2-peterx@redhat.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200409164954.36902-1-peterx@redhat.com> References: <20200409164954.36902-1-peterx@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , peterx@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" This can expose the issue earlier on which register returned the wrong result. Signed-off-by: Peter Xu --- gdbstub.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gdbstub.c b/gdbstub.c index 171e150950..f763545e81 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -911,17 +911,22 @@ static int gdb_read_register(CPUState *cpu, GByteArra= y *buf, int reg) CPUClass *cc =3D CPU_GET_CLASS(cpu); CPUArchState *env =3D cpu->env_ptr; GDBRegisterState *r; + int len =3D 0, orig_len =3D buf->len; =20 if (reg < cc->gdb_num_core_regs) { - return cc->gdb_read_register(cpu, buf, reg); + len =3D cc->gdb_read_register(cpu, buf, reg); } =20 for (r =3D cpu->gdb_regs; r; r =3D r->next) { if (r->base_reg <=3D reg && reg < r->base_reg + r->num_regs) { - return r->get_reg(env, buf, reg - r->base_reg); + len =3D r->get_reg(env, buf, reg - r->base_reg); + break; } } - return 0; + + assert(len =3D=3D buf->len - orig_len); + + return len; } =20 static int gdb_write_register(CPUState *cpu, uint8_t *mem_buf, int reg) --=20 2.24.1 From nobody Sat May 18 19:24:32 2024 Delivered-To: importer@patchew.org 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; 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=1586451413; cv=none; d=zohomail.com; s=zohoarc; b=NWHBVbu6HEc0g90LC5tCXJW2FvNsSTLrmmveAjpR8EL2DrDTgV/S3rAEAAnu6QGNCVpz93b7nLFcDOQLrYJSB1ip+8XxOthIE9ZTEl6pv3v39Gaq7aMr7JM1Kdo+UFGlCS82TllLBk0N8zg/4yPnZc7grBb6b+SwpqYlM9UcT9U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1586451413; 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=4NGfhs1HGx/KhU+MvTCQJYOweIqJyMhKQdliqlI/tvQ=; b=K0UMTJGWHhvAL5w8qtQq4vgmwM/jChXDodzwPBSFNR71lRikNdBBaGQ49jEF4o0lifOj55hiJGCUXg1okk0Xbnl5EUf3IJgS49fSRpZGYJ0fsLJYzFW5ehOLahgSTk59q28IiIbE08paCfcWIu3ujSeB4C4/qqs6tNomtv/OQME= 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 1586451413474152.35075454348976; Thu, 9 Apr 2020 09:56:53 -0700 (PDT) Received: from localhost ([::1]:52798 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jMaU0-0000SE-7o for importer@patchew.org; Thu, 09 Apr 2020 12:56:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59412) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jMaNi-0004AQ-8V for qemu-devel@nongnu.org; Thu, 09 Apr 2020 12:50:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jMaNX-0004I0-4t for qemu-devel@nongnu.org; Thu, 09 Apr 2020 12:50:21 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:22553 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jMaNX-0004Hv-1I for qemu-devel@nongnu.org; Thu, 09 Apr 2020 12:50:11 -0400 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-324-rLRxIrbrOtGnEP3hmlyoDg-1; Thu, 09 Apr 2020 12:50:09 -0400 Received: by mail-wm1-f69.google.com with SMTP id 2so295884wmf.1 for ; Thu, 09 Apr 2020 09:50:08 -0700 (PDT) Received: from xz-x1.redhat.com ([2607:9880:19c0:32::2]) by smtp.gmail.com with ESMTPSA id a67sm4446634wmc.30.2020.04.09.09.50.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Apr 2020 09:50:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1586451010; 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=4NGfhs1HGx/KhU+MvTCQJYOweIqJyMhKQdliqlI/tvQ=; b=jD8C0wXclh5dj7iofZ9haF0EVTngOSA4/yb16C6Dl6//EnQKSvsPUyi0TrEJj3Bi0OgxpY 7ak9GBlQcb17tTMqYxnZh2TGblNVPc4ZhcG12yhJvMf1gq310ygCdxf+jg9FJMw999fz7k j6OCFfpGaM12HRgYG9kniZbd7PCj53I= X-MC-Unique: rLRxIrbrOtGnEP3hmlyoDg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RZ7KiZLbzf6nVOm0eQ0Iw1Tt+NS2d318U/9Sx06YhPU=; b=IdFCdhEHKhBN1Y1xuZj1GI4ntXtVpA1p2gCSGC3PxvcdunEIiDGp4WkplkumecXo9b +EE5cwElYpeb9Sd538XhcIIPe0A7oE6w5pInAoPaq9n2Us9sd7N6fpAwlmyqBS7FnTgD ZbbVMYYRiCuyZSs6UCU8ed6EufMlcBW14OuuEJ+liLZGqkRcqw8NyG0zDau/VPuCJeKx 3PImbiAgfU8Je3m9ZpTHZBQRlg8r8mzYy2yeLt/Y3ofd7whwagxnN5ivOIYW2sppx7Y2 foLkMNMVCKff2ZB2cW4C7mTpn5lZ3xljMomdx46rwgaLk01RsBCRqmM6IKsrscoF5VDJ o0aQ== X-Gm-Message-State: AGi0PuZYcKHlwRpnrW3+Sps2GxlTxVPAsun3CxGpMotFbF8trZJ5NT+G l1CT3oJ0O8MhFhUmLZYLpMoqteYG2Jh7mSgtBgRz4b6nbJpfhQrC9i4/ZIjUdlse4uxxGdJbgia MBFNdowUv/gkwrTU= X-Received: by 2002:a5d:6104:: with SMTP id v4mr38737wrt.213.1586451007372; Thu, 09 Apr 2020 09:50:07 -0700 (PDT) X-Google-Smtp-Source: APiQypJK4PkSHMBI1mFhhJEoFFfcw/cqC/y7VuUAL9Nnt8mD2rDnOGL8vc11TP2hOJTKoJx3sE0Y/Q== X-Received: by 2002:a5d:6104:: with SMTP id v4mr38720wrt.213.1586451007186; Thu, 09 Apr 2020 09:50:07 -0700 (PDT) From: Peter Xu To: qemu-devel@nongnu.org Subject: [PATCH 2/2] gdbstub: i386: Fix gdb_get_reg16() parameter to unbreak gdb Date: Thu, 9 Apr 2020 12:49:54 -0400 Message-Id: <20200409164954.36902-3-peterx@redhat.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200409164954.36902-1-peterx@redhat.com> References: <20200409164954.36902-1-peterx@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.120 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , peterx@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 should only pass in gdb_get_reg16() with the GByteArray* object itself, no need to shift. Without this patch, gdb remote attach will crash QEMU. Cc: Alex Benn=C3=A9e Cc: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Peter Xu Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- target/i386/gdbstub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/i386/gdbstub.c b/target/i386/gdbstub.c index f3d23b614e..b98a99500a 100644 --- a/target/i386/gdbstub.c +++ b/target/i386/gdbstub.c @@ -106,7 +106,7 @@ int x86_cpu_gdb_read_register(CPUState *cs, GByteArray = *mem_buf, int n) } else if (n >=3D IDX_FP_REGS && n < IDX_FP_REGS + 8) { floatx80 *fp =3D (floatx80 *) &env->fpregs[n - IDX_FP_REGS]; int len =3D gdb_get_reg64(mem_buf, cpu_to_le64(fp->low)); - len +=3D gdb_get_reg16(mem_buf + len, cpu_to_le16(fp->high)); + len +=3D gdb_get_reg16(mem_buf, cpu_to_le16(fp->high)); return len; } else if (n >=3D IDX_XMM_REGS && n < IDX_XMM_REGS + CPU_NB_REGS) { n -=3D IDX_XMM_REGS; --=20 2.24.1