Message ID | 1538295197-23704-72-git-send-email-pbonzini@redhat.com |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="AoNyKmcM"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42NK5V6ZRDz9s3x for <incoming@patchwork.ozlabs.org>; Sun, 30 Sep 2018 18:56:14 +1000 (AEST) Received: from localhost ([::1]:54449 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1g6XWO-0000xh-FU for incoming@patchwork.ozlabs.org; Sun, 30 Sep 2018 04:56:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41905) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1g6WsI-0003BW-Bu for qemu-devel@nongnu.org; Sun, 30 Sep 2018 04:14:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1g6WsC-0001IF-SJ for qemu-devel@nongnu.org; Sun, 30 Sep 2018 04:14:43 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:42388) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1g6WsC-0001Bw-7e for qemu-devel@nongnu.org; Sun, 30 Sep 2018 04:14:40 -0400 Received: by mail-wr1-x42b.google.com with SMTP id b11-v6so10456482wru.9 for <qemu-devel@nongnu.org>; Sun, 30 Sep 2018 01:14:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=8EHh6R7rfpxKUdyKSV2KUfONkxfIfFf9MvKjlFhCRVQ=; b=AoNyKmcMBFW8HnQZ6XDs8ghiUM0ZiXNMsu9SV1uipq68SJePzwQjhr08PD+kdIeUWG 5YkwqKTdqDF1HKaVt05uJmHvGDqAznskrNVPshabI/kq+Aq/96+lVqanOK8exrIjgZRT C2oMsn/XKpNwjyHKaNcsSnV7NF2TpFkzeNr+pIFAmim2s5aQNwEo63fMyil52P26GjXm m7TT16x/6vKnff655hXSLE7SPoaqxZkk35W4jl2bOECks4ChGzPXNRzBQkDQtINID2dP k+ffqleAABItHFIvIpRalOhtQm5/+0zomDEBr4/cNzcpr54IDBqW2YLdIjGjM4NlHVlK NfWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=8EHh6R7rfpxKUdyKSV2KUfONkxfIfFf9MvKjlFhCRVQ=; b=VTQL/XgV2PLH+FGXYT/WFlE7S+WMU/eBjZMOSEDMfZj+85Jxm0ol5unYssyAqyrC4H yc7DJD1AtrupcOJiG5SiJeUG6uUXYYdz0iLWISKuDU1smiApwSdaJ75iu4SMxIBmZR5T UgK0ZLcW4OXjAukXxbfeN0faTSnOt1o2Gg+7nJtj9JSMQYq9Sll9TaYVZluvKHa6t/iZ IwqnCVNJztvflDwm3fC9B/gKYRhJj+tcZRix6TDSQCc3T4Dsp3oL9Y074KbRA/sAcSU7 HF/16fyZwF6Nk/qB1p7IBXiWJI8IAE8E+7U3zIt9T6TRMQLrGqm+YBVkPqBUujIua5Qq N2Vg== X-Gm-Message-State: ABuFfoh3yeAdoZvTTLaxeZ8Lydj+bJ5oPUCIXJEvUPpuez0QmbYyhgm1 rp/mpowsUTGJIgNcE2dkDFb1ocE5 X-Google-Smtp-Source: ACcGV6347kkvk8oB4Hx77wcRYw6jJn4spp4yvyL2emoNvgN1DgVtA0b0rT+nWN7bAqTC/ZINyrf+rQ== X-Received: by 2002:a5d:6902:: with SMTP id t2-v6mr3628007wru.323.1538295273193; Sun, 30 Sep 2018 01:14:33 -0700 (PDT) Received: from 640k.lan (94-36-187-248.adsl-ull.clienti.tiscali.it. [94.36.187.248]) by smtp.gmail.com with ESMTPSA id u76-v6sm11369194wmd.10.2018.09.30.01.14.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 30 Sep 2018 01:14:32 -0700 (PDT) From: Paolo Bonzini <pbonzini@redhat.com> To: qemu-devel@nongnu.org Date: Sun, 30 Sep 2018 10:13:09 +0200 Message-Id: <1538295197-23704-72-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1538295197-23704-1-git-send-email-pbonzini@redhat.com> References: <1538295197-23704-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42b Subject: [Qemu-devel] [PULL 71/79] virtio: do not take address of packed members X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: Peter Maydell <peter.maydell@linaro.org>, Jason Wang <jasowang@redhat.com> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
[PULL,01/79] virtio: Return true from virtio_queue_empty if broken
|
expand
|
diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c index d2dd8ab..04e3ebe 100644 --- a/hw/char/virtio-serial-bus.c +++ b/hw/char/virtio-serial-bus.c @@ -667,9 +667,9 @@ static void virtio_serial_save_device(VirtIODevice *vdev, QEMUFile *f) /* The config space (ignored on the far end in current versions) */ get_config(vdev, (uint8_t *)&config); - qemu_put_be16s(f, &config.cols); - qemu_put_be16s(f, &config.rows); - qemu_put_be32s(f, &config.max_nr_ports); + qemu_put_be16(f, config.cols); + qemu_put_be16(f, config.rows); + qemu_put_be32(f, config.max_nr_ports); /* The ports map */ max_nr_ports = s->serial.max_virtserial_ports;
The address of a packed member is not packed, which may cause accesses to unaligned pointers. Avoid this by reading the packed value before passing it to another function. Cc: Jason Wang <jasowang@redhat.com> Cc: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- hw/char/virtio-serial-bus.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)