qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Wei Yang <richardw.yang@linux.intel.com>
To: "Philippe Mathieu-Daudé" <philmd@redhat.com>
Cc: "Prasad J Pandit" <pjp@fedoraproject.org>,
	"Marc-André Lureau" <marcandre.lureau@redhat.com>,
	qemu-devel@nongnu.org, "Paolo Bonzini" <pbonzini@redhat.com>,
	"Gerd Hoffmann" <kraxel@redhat.com>
Subject: Re: [Qemu-devel] [PATCH v2 1/9] ccid-card-passthru: Move assertion in read() to can_read()
Date: Fri, 15 Feb 2019 16:44:51 +0800	[thread overview]
Message-ID: <20190215084451.GA5456@richard> (raw)
In-Reply-To: <20190214201939.494-2-philmd@redhat.com>

On Thu, Feb 14, 2019 at 09:19:31PM +0100, Philippe Mathieu-Daudé wrote:
>chardev::read() depends of what chardev::can_read() returns, move the
>assertion to can_read().
>
>Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
>Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>---
> hw/usb/ccid-card-passthru.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
>diff --git a/hw/usb/ccid-card-passthru.c b/hw/usb/ccid-card-passthru.c
>index 0a6c657228..8bb1314f49 100644
>--- a/hw/usb/ccid-card-passthru.c
>+++ b/hw/usb/ccid-card-passthru.c
>@@ -116,8 +116,8 @@ static int ccid_card_vscard_can_read(void *opaque)
> {
>     PassthruState *card = opaque;
> 
>-    return VSCARD_IN_SIZE >= card->vscard_in_pos ?
>-           VSCARD_IN_SIZE - card->vscard_in_pos : 0;
>+    assert(card->vscard_in_pos <= VSCARD_IN_SIZE);

Do you have special reason change "<" to "<="?

>+    return VSCARD_IN_SIZE - card->vscard_in_pos;
> }
> 
> static void ccid_card_vscard_handle_init(
>@@ -282,7 +282,6 @@ static void ccid_card_vscard_read(void *opaque, const uint8_t *buf, int size)
>         ccid_card_vscard_drop_connection(card);
>         return;
>     }
>-    assert(card->vscard_in_pos < VSCARD_IN_SIZE);
>     assert(card->vscard_in_hdr < VSCARD_IN_SIZE);
>     memcpy(card->vscard_in_data + card->vscard_in_pos, buf, size);
>     card->vscard_in_pos += size;
>-- 
>2.20.1
>

-- 
Wei Yang
Help you, Help me

  parent reply	other threads:[~2019-02-15  8:45 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-14 20:19 [Qemu-devel] [PATCH v2 0/9] ccid-card-passthru: check buffer size parameter Philippe Mathieu-Daudé
2019-02-14 20:19 ` [Qemu-devel] [PATCH v2 1/9] ccid-card-passthru: Move assertion in read() to can_read() Philippe Mathieu-Daudé
2019-02-14 21:18   ` Eric Blake
2019-02-15  8:44   ` Wei Yang [this message]
2019-02-15 11:02   ` Marc-André Lureau
2019-02-14 20:19 ` [Qemu-devel] [PATCH v2 2/9] ccid-card-passthru: Replace never trigger if statement by an assertion Philippe Mathieu-Daudé
2019-02-15 10:59   ` Marc-André Lureau
2019-02-18 22:10     ` Philippe Mathieu-Daudé
2019-02-21 11:04       ` P J P
2019-02-21 11:09         ` Marc-André Lureau
2019-02-14 20:19 ` [Qemu-devel] [PATCH v2 3/9] ccid-card-passthru: Assert on a stricter expression Philippe Mathieu-Daudé
2019-02-15  8:47   ` Wei Yang
2019-02-15 11:15   ` Marc-André Lureau
2019-02-14 20:19 ` [Qemu-devel] [PATCH v2 4/9] ccid-card-passthru: Let the chardev::read() be more generic Philippe Mathieu-Daudé
2019-02-15 11:43   ` Marc-André Lureau
2019-02-14 20:19 ` [Qemu-devel] [PATCH v2 5/9] ccid-card-passthru: Replace assert() by QEMU_BUILD_BUG_ON() Philippe Mathieu-Daudé
2019-02-15 11:44   ` Marc-André Lureau
2019-02-14 20:19 ` [Qemu-devel] [PATCH v2 6/9] ccid-card-passthru: Simplify the if() condition Philippe Mathieu-Daudé
2019-02-15 11:49   ` Marc-André Lureau
2019-02-14 20:19 ` [Qemu-devel] [PATCH v2 7/9] ccid-card-passthru: Use QERR_MISSING_PARAMETER Philippe Mathieu-Daudé
2019-02-14 21:22   ` Eric Blake
2019-02-14 20:19 ` [Qemu-devel] [PATCH v2 8/9] ccid-card-passthru: Use size_t to hold size argument Philippe Mathieu-Daudé
2019-02-15 11:51   ` Marc-André Lureau
2019-02-14 20:19 ` [Qemu-devel] [PATCH v2 9/9] ccid-card-passthru: Use size_t for index Philippe Mathieu-Daudé
2019-02-15 11:52   ` Marc-André Lureau

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190215084451.GA5456@richard \
    --to=richardw.yang@linux.intel.com \
    --cc=kraxel@redhat.com \
    --cc=marcandre.lureau@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=philmd@redhat.com \
    --cc=pjp@fedoraproject.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).