From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:54005)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jasowang@redhat.com>) id 1aFzlG-0003uL-VB
	for qemu-devel@nongnu.org; Mon, 04 Jan 2016 02:41:03 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jasowang@redhat.com>) id 1aFzlC-0007CO-08
	for qemu-devel@nongnu.org; Mon, 04 Jan 2016 02:41:02 -0500
Received: from mx1.redhat.com ([209.132.183.28]:42182)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jasowang@redhat.com>) id 1aFzlB-0007CK-Qg
	for qemu-devel@nongnu.org; Mon, 04 Jan 2016 02:40:57 -0500
References: <CAG0+Huhm-rwDJ_6+bThsVMDWLK2QxgvsmHinJYXXTTDkBCFmNA@mail.gmail.com>
From: Jason Wang <jasowang@redhat.com>
Message-ID: <568A2201.8070204@redhat.com>
Date: Mon, 4 Jan 2016 15:40:49 +0800
MIME-Version: 1.0
In-Reply-To: <CAG0+Huhm-rwDJ_6+bThsVMDWLK2QxgvsmHinJYXXTTDkBCFmNA@mail.gmail.com>
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH] l2tpv3: fix cookie decoding
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>
To: "Alexis D...t" <alexis.dambricourt@gmail.com>, qemu-devel@nongnu.org



On 12/31/2015 10:34 PM, Alexis D...t wrote:
> If a 32 bits l2tpv3 frame cookie MSB if set to 1, the cast to uint64_t
> cookie will
> spread 1 to the four most significant bytes.
> Then the condition (cookie != s->rx_cookie) becomes false.
>
> Signed-off-by: Alexis Dambricourt <alexis.dambricourt@gmail.com>
> ---
>  net/l2tpv3.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/l2tpv3.c b/net/l2tpv3.c
> index 8e68e54..21d6119 100644
> --- a/net/l2tpv3.c
> +++ b/net/l2tpv3.c
> @@ -325,7 +325,7 @@ static int l2tpv3_verify_header(NetL2TPV3State *s,
> uint8_t *buf)
>          if (s->cookie_is_64) {
>              cookie = ldq_be_p(buf + s->cookie_offset);
>          } else {
> -            cookie = ldl_be_p(buf + s->cookie_offset);
> +            cookie = ldl_be_p(buf + s->cookie_offset) & 0xffffffffULL;
>          }
>          if (cookie != s->rx_cookie) {
>              if (!s->header_mismatch) {

Hi:

Patch looks good. But it fails to be applied cleanly:

Applying: l2tpv3: fix cookie decoding
fatal: corrupt patch at line 10
Patch failed at 0001 l2tpv3: fix cookie decoding

It's suggested to use git-foramt-patch(1) and git-send-email(1) to
format and send patches.