From nobody Wed Apr 16 03:53:26 2025 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=1583930531; cv=none; d=zohomail.com; s=zohoarc; b=M1n6kj2m/tRT8K73F2MW+emjdfAmiJ1k+KLCgNDu/hh428mrJ6DtCL6ifEubCDZvN5m32Yb3sHp1mDwceBYECd9p6G3YhCrmgLhmR45uhkEaN3tZQ7T+ZCb4GhQwvIce2GBhyJ88BXDGoMMVUDpAhb8mNUJQx77ht7XIIRexyeE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583930531; 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=tjIHP9UFruVDoydfZu86iPJdLD2gZX7JnMJoEBOXlN0=; b=BaRBE+qsUC445OlGFGmvwn+HWBN6lmYVUPD6VFKQ/6qrUowZkGCjd9ywOzK1ItC5dtmYpKiDv1BMDzAXwG4ci6Lm1r6K4r1ehHp2YRQuLHnClNmVqSGZuFfnswYjsLEL0KncS4YgQG7TEBJfChWzAMu1OwdylDn/EpEBwqcyOqM= 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 158393053128523.85986594609733; Wed, 11 Mar 2020 05:42:11 -0700 (PDT) Received: from localhost ([::1]:51134 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jC0gc-00083w-5W for importer@patchew.org; Wed, 11 Mar 2020 08:42:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46831) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jC0fW-0006L7-TV for qemu-devel@nongnu.org; Wed, 11 Mar 2020 08:41:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jC0fV-0000Bk-JA for qemu-devel@nongnu.org; Wed, 11 Mar 2020 08:41:02 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:45357 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jC0fV-0000BI-G3 for qemu-devel@nongnu.org; Wed, 11 Mar 2020 08:41:01 -0400 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-153-B3WmZbWvPfmaMptAT9VXFQ-1; Wed, 11 Mar 2020 08:40:56 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AD451477; Wed, 11 Mar 2020 12:40:55 +0000 (UTC) Received: from localhost (unknown [10.36.118.127]) by smtp.corp.redhat.com (Postfix) with ESMTP id 93571907F7; Wed, 11 Mar 2020 12:40:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583930461; 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=tjIHP9UFruVDoydfZu86iPJdLD2gZX7JnMJoEBOXlN0=; b=BJOVDRJ9E5XPunYQGnRRkMgRJVk6AF8mdhYKX2mdqJuMggpfTQ9z2/DVXEep3SmSEt8X37 nsAGBaCfky0xW+NBUkjTmMUm3o8E+Q8/Aw3ctGhurX2kN/y7ekUSkKLaDDDFb4ZDwL6VEC LahqQxUggy1fnPTmKlx3IEUIiq7XG3o= X-MC-Unique: B3WmZbWvPfmaMptAT9VXFQ-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PULL 1/9] qemu/queue.h: clear linked list pointers on remove Date: Wed, 11 Mar 2020 12:40:37 +0000 Message-Id: <20200311124045.277969-2-stefanha@redhat.com> In-Reply-To: <20200311124045.277969-1-stefanha@redhat.com> References: <20200311124045.277969-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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.81 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: Fam Zheng , Peter Maydell , qemu-block@nongnu.org, Max Reitz , Stefan Hajnoczi , Paolo Bonzini , Kevin Wolf 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" Do not leave stale linked list pointers around after removal. It's safer to set them to NULL so that use-after-removal results in an immediate segfault. The RCU queue removal macros are unchanged since nodes may still be traversed after removal. Suggested-by: Paolo Bonzini Signed-off-by: Stefan Hajnoczi Link: https://lore.kernel.org/r/20200224103406.1894923-2-stefanha@redhat.com Message-Id: <20200224103406.1894923-2-stefanha@redhat.com> --- include/qemu/queue.h | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/include/qemu/queue.h b/include/qemu/queue.h index 294db54eb1..456a5b01ee 100644 --- a/include/qemu/queue.h +++ b/include/qemu/queue.h @@ -142,6 +142,8 @@ struct { = \ (elm)->field.le_next->field.le_prev =3D \ (elm)->field.le_prev; \ *(elm)->field.le_prev =3D (elm)->field.le_next; \ + (elm)->field.le_next =3D NULL; \ + (elm)->field.le_prev =3D NULL; \ } while (/*CONSTCOND*/0) =20 /* @@ -225,12 +227,15 @@ struct { = \ } while (/*CONSTCOND*/0) =20 #define QSLIST_REMOVE_HEAD(head, field) do { \ - (head)->slh_first =3D (head)->slh_first->field.sle_next; \ + typeof((head)->slh_first) elm =3D (head)->slh_first; = \ + (head)->slh_first =3D elm->field.sle_next; = \ + elm->field.sle_next =3D NULL; = \ } while (/*CONSTCOND*/0) =20 #define QSLIST_REMOVE_AFTER(slistelm, field) do { \ - (slistelm)->field.sle_next =3D \ - QSLIST_NEXT(QSLIST_NEXT((slistelm), field), field); \ + typeof(slistelm) next =3D (slistelm)->field.sle_next; \ + (slistelm)->field.sle_next =3D next->field.sle_next; \ + next->field.sle_next =3D NULL; \ } while (/*CONSTCOND*/0) =20 #define QSLIST_REMOVE(head, elm, type, field) do { \ @@ -241,6 +246,7 @@ struct { = \ while (curelm->field.sle_next !=3D (elm)) \ curelm =3D curelm->field.sle_next; \ curelm->field.sle_next =3D curelm->field.sle_next->field.sle_next;= \ + (elm)->field.sle_next =3D NULL; \ } \ } while (/*CONSTCOND*/0) =20 @@ -304,8 +310,10 @@ struct { = \ } while (/*CONSTCOND*/0) =20 #define QSIMPLEQ_REMOVE_HEAD(head, field) do { \ - if (((head)->sqh_first =3D (head)->sqh_first->field.sqe_next) =3D=3D N= ULL)\ + typeof((head)->sqh_first) elm =3D (head)->sqh_first; \ + if (((head)->sqh_first =3D elm->field.sqe_next) =3D=3D NULL) = \ (head)->sqh_last =3D &(head)->sqh_first; \ + elm->field.sqe_next =3D NULL; \ } while (/*CONSTCOND*/0) =20 #define QSIMPLEQ_SPLIT_AFTER(head, elm, field, removed) do { \ @@ -329,6 +337,7 @@ struct { = \ if ((curelm->field.sqe_next =3D \ curelm->field.sqe_next->field.sqe_next) =3D=3D NULL) = \ (head)->sqh_last =3D &(curelm)->field.sqe_next; \ + (elm)->field.sqe_next =3D NULL; \ } \ } while (/*CONSTCOND*/0) =20 @@ -446,6 +455,8 @@ union { = \ (head)->tqh_circ.tql_prev =3D (elm)->field.tqe_circ.tql_prev; \ (elm)->field.tqe_circ.tql_prev->tql_next =3D (elm)->field.tqe_next= ; \ (elm)->field.tqe_circ.tql_prev =3D NULL; \ + (elm)->field.tqe_circ.tql_next =3D NULL; \ + (elm)->field.tqe_next =3D NULL; \ } while (/*CONSTCOND*/0) =20 /* remove @left, @right and all elements in between from @head */ --=20 2.24.1