From patchwork Wed Apr 21 15:22:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 425298 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp429538jao; Wed, 21 Apr 2021 08:27:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwvi402jnjfhnmtdUrO3Vpt106g5W800EYrfh1/YVLx9NDwUBuEjzzbjEQkO6+8kFJ1BFco X-Received: by 2002:a02:1989:: with SMTP id b131mr19551827jab.54.1619018829360; Wed, 21 Apr 2021 08:27:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619018829; cv=none; d=google.com; s=arc-20160816; b=JZJscUvmJCZzcCnIVpkk5CSUfbkQIZbDCK77rb2V3Ln9FFPALRCBDIo7zaTj8FFd30 aDdf2jzkaObnRwNx/5shgjt5IRpIqajmfdcME8k4lDDQtsKpvohBud3TY3JQjPFStW25 QusdxNKfQy67qxEfehvr5YjpF1tOewFYD7kkO89hO0+MIxVdjvBIwXA4zRlXjsfNkRLs IueU9zdUWwHnJN6z33f2VIe7Gc5Tzqff5h0Md/VqY4uONvZRkXQcXtTZnEIUqpGka5ck VxzVL1ZMk8fmAa6KN8w+nutyw6GUj67mY/YJxZHXV3X4PNkRluHF3Wts+lxe56T9MqBH JOvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:to:from:dkim-signature; bh=CCtmOtwws9SINVeLkgek76f/V4rXU+1c62jCYog0mqU=; b=LY1jr1KeHQXIMVAmtui/LMlfFKRRhVHeU+9s4DJIbxQStUp2RP8gKYiO8p+EZ/UbeK GjoP5hpPsQ+J5mgwGR8RxYWKL5xk8OL5v0KlrYU9OSZkgsZ1KAZyLE/dwhsG98hG0ZkB OsBAEXixAgMeBXLPs92d6P/c3lh93c1UIa6Q+wLMrtr1oxplKGh3iJYpeIgJ2tR+QyOI JxzDIw/kUOfLPVQPxUwp/Cekj3h6Vje1WBXS/0BL7TLpDo94FtgXKYsScbbfLZsTC97b KpoJWjvmj5q7Bna5H53SQNflngfpbQShNO2GbytIk//6SUlPe0Eluj2oPDxHVR+ECFp0 6P3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=Y7ZOQI8n; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id m13si2018019jah.21.2021.04.21.08.27.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 21 Apr 2021 08:27:09 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=Y7ZOQI8n; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:45656 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lZEku-0000Cz-Qh for patch@linaro.org; Wed, 21 Apr 2021 11:27:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38744) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lZEjM-0007V7-Mw for qemu-devel@nongnu.org; Wed, 21 Apr 2021 11:25:32 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:31210) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lZEjK-0006GU-OH for qemu-devel@nongnu.org; Wed, 21 Apr 2021 11:25:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619018728; 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; bh=CCtmOtwws9SINVeLkgek76f/V4rXU+1c62jCYog0mqU=; b=Y7ZOQI8n89J9o4FzZYze4zgz9SumnTeBJNP1WtttUYYslKHgab/I6ijE9zYppT19tBUsvy yyM9sLSXC4rvIAsYikYdi1sa53K4ZO1PpQgbt9mt+qWkm9cyjrsG4w/c38O9rmA60yns6o jIRinpBA46PoUJ+Bk/42XqnZAUCGDow= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-99-fI8GWUH2NUO9W6kUTUAkJQ-1; Wed, 21 Apr 2021 11:24:42 -0400 X-MC-Unique: fI8GWUH2NUO9W6kUTUAkJQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3A79710A23C1; Wed, 21 Apr 2021 15:22:52 +0000 (UTC) Received: from worklaptop.home (ovpn-117-254.rdu2.redhat.com [10.10.117.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id BBBC35C1B4; Wed, 21 Apr 2021 15:22:51 +0000 (UTC) From: Cole Robinson To: qemu-devel@nongnu.org Subject: [PATCH-for-6.0] net: tap: fix crash on hotplug Date: Wed, 21 Apr 2021 11:22:45 -0400 Message-Id: <3f6be9c84782a0943ea21a8a6f8a5d055b65f2d5.1619018363.git.crobinso@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=crobinso@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=crobinso@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Peter Maydell , jasowang@redhat.com, Cole Robinson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Attempting to hotplug a tap nic with libvirt will crash qemu: $ sudo virsh attach-interface f32 network default error: Failed to attach interface error: Unable to read from monitor: Connection reset by peer 0x000055875b7f3a99 in tap_send (opaque=0x55875e39eae0) at ../net/tap.c:206 206 if (!s->nc.peer->do_not_pad) { gdb$ bt s->nc.peer may not be set at this point. This seems to be an expected case, as qemu_send_packet_* explicitly checks for NULL s->nc.peer later. Fix it by checking for s->nc.peer here too. Padding is applied if s->nc.peer is not set. https://bugzilla.redhat.com/show_bug.cgi?id=1949786 Fixes: 969e50b61a2 Signed-off-by: Cole Robinson --- * Or should we skip padding if nc.peer is unset? I didn't dig into it * tap-win3.c and slirp.c may need a similar fix, but the slirp case didn't crash in a simple test. net/tap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.31.1 diff --git a/net/tap.c b/net/tap.c index dd42ac6134..937559dbb8 100644 --- a/net/tap.c +++ b/net/tap.c @@ -203,7 +203,7 @@ static void tap_send(void *opaque) size -= s->host_vnet_hdr_len; } - if (!s->nc.peer->do_not_pad) { + if (!s->nc.peer || !s->nc.peer->do_not_pad) { if (eth_pad_short_frame(min_pkt, &min_pktsz, buf, size)) { buf = min_pkt; size = min_pktsz;