From nobody Wed Feb 5 23:04:43 2025 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3F7A2242254 for ; Wed, 15 Jan 2025 10:30:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736937004; cv=none; b=VjsyZlPUBcApS861Ihop9LLhAkpXjb1WTUnjhU/HEPtdmTBoXcziMPBBn/nczo2GN1C0J54XasQ1RhviqNRI83h5ZhQDxqfNMxaYHPPuVPBV6zaqpCe6+B2r8yrkPct5n9mQl6Yj9R9jWulLyLmErDi5+cDG5c4wNDW2u4LLM/A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736937004; c=relaxed/simple; bh=AuS/iv6kct3xwW/JT6RfpDdtL/kYEb8lhYq9bZGCAcA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BjFYIEcYL1c8UEA2g0d90+JokAZLDQsrRUsRuW5BBh1U89ysZM9yQVQaF5oEzXPp61xvzr3Yl0EzCqJGIHGc4MvmGNSNjpUjFxmJ9lQP63mtFTwoSW2+KRIzyLB9C8WhqX7at6G4GpbJ0MZnIQe9JHClSLd8/vvbcP5QOqu/TGo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=lR0fSQdi; arc=none smtp.client-ip=209.85.214.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="lR0fSQdi" Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-21a7ed0155cso112278855ad.3 for ; Wed, 15 Jan 2025 02:30:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1736937001; x=1737541801; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vhgcFiioBCTJrsBu7R7SWfvrloYa7MHsggVE4kmGhcU=; b=lR0fSQdiE04ikti+5xq8WaDFxzwVQeHg00rN11k+au+7HPHtKuWQWs9Thgfz8tmALw 5vfNFj8uLCMz2/Ok7bzr6zbU4Am+zfIpirMWAuu3ZDrCMaoMmN+dQzeF1BMXQD+k+wsJ gsj0vAL3byHY9P59YTMwJtwOK8brJh897vO3c= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736937001; x=1737541801; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vhgcFiioBCTJrsBu7R7SWfvrloYa7MHsggVE4kmGhcU=; b=d9U4q6rXO8+9P65E60Cof9l58lVgJCzJMB/hoVjKU0QVTVLTMKGiqnJMrPXhv+teDA DKaBaukkqsEhqYGDWuIU3F/3vrAuGe9xxntxkWJULPHIK7lJ3PtOaATUDW+EKGfcyw2G 7rjaiqKQsAG3heaVa6Zf4htovRaH+wGq30MLW1o46SbHIi9OMtkz0+xCepwwr5O+bnfA muJIMdUMwv0wBQ0Jb6mXvdNwOXYCl3Gsh5ke5qaQUZWOInCPrGR8ueZ0fXTvMPezOtxK r65MJIE4PL1gaUDqJEhN9TL4HpnCY5B8pT5AgUp5FTSHcj6AGxU/UGGOcf5Q41V2yanf RuvQ== X-Forwarded-Encrypted: i=1; AJvYcCVIj3sBR5F3hTo4d03uM5Q9eppcVUNcAeCibH441WCjurq7e8MZT4ZJyGwZafMnvJt5+n99NWcXm87nT+s=@vger.kernel.org X-Gm-Message-State: AOJu0Yz/48oBi54gnD8WjriKMwe5UHdOOyqMaaVur0b9h7VNESNrxJmq NG9/6+6gaRUB+jVqB9E/K5oh1cg/Trh9OQjJJVHg6GX8w46wL2fTnkVqpz5MNg== X-Gm-Gg: ASbGncvC3blpf6PryIa+cj7vV0DxJAarHwmBnWbdE+XkvZ89awMcAiszsXmKs/D8igS +7KfGJ/ETyTR0vynDm3AH4ViK2TbIS3zINv/1ppzFzotxb/nRvlvuyQacEG82IzvjYPSRcitiHh dfaJKOCQ83VKb4h8E3SycFv/KviKH5Rhxbc3WFLIlBIW0XKNbs3t/DQfPUHdmYgik21pJj0fbPt 33IaSk1g2PLeKCFMvkLGx04cBvpUfcYAgRfD2chwxfbaq+Xs72cwoZw024Zm2Lz1blSMbS29PoS OCJf4FrSAgPHRh+zeVbIKpBi1pl2TDG2bQH4x6eovJ+kKg== X-Google-Smtp-Source: AGHT+IHLfLGJgEZ5SLuPyAwiMbZYFQ09flUH9NUqIb9U6+ujP8obt/r8pocQNQyqRrN/HC41+DPhzg== X-Received: by 2002:a05:6a00:9a7:b0:725:ebab:bb2e with SMTP id d2e1a72fcca58-72d21f64e2amr37892682b3a.11.1736937001568; Wed, 15 Jan 2025 02:30:01 -0800 (PST) Received: from li-cloudtop.c.googlers.com.com (134.90.125.34.bc.googleusercontent.com. [34.125.90.134]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72d4067e591sm8835195b3a.126.2025.01.15.02.30.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jan 2025 02:30:01 -0800 (PST) From: Li Li To: dualli@google.com, corbet@lwn.net, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, donald.hunter@gmail.com, gregkh@linuxfoundation.org, arve@android.com, tkjos@android.com, maco@android.com, joel@joelfernandes.org, brauner@kernel.org, cmllamas@google.com, surenb@google.com, arnd@arndb.de, masahiroy@kernel.org, bagasdotme@gmail.com, horms@kernel.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, netdev@vger.kernel.org, hridya@google.com, smoreland@google.com Cc: kernel-team@android.com Subject: [PATCH v13 2/3] netdev-genl: run ynl-regen to fix CFI failure Date: Wed, 15 Jan 2025 02:29:49 -0800 Message-ID: <20250115102950.563615-3-dualli@chromium.org> X-Mailer: git-send-email 2.48.0.rc2.279.g1de40edade-goog In-Reply-To: <20250115102950.563615-1-dualli@chromium.org> References: <20250115102950.563615-1-dualli@chromium.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Li Li The ynl-gen tool has been updated to generate trampolines for sock-priv to fix the CFI failure. Run ynl-regen to apply the fix to netdev-genl. Signed-off-by: Li Li --- net/core/netdev-genl-gen.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/net/core/netdev-genl-gen.c b/net/core/netdev-genl-gen.c index a89cbd8d87c3..996ac6a449eb 100644 --- a/net/core/netdev-genl-gen.c +++ b/net/core/netdev-genl-gen.c @@ -197,6 +197,16 @@ static const struct genl_multicast_group netdev_nl_mcg= rps[] =3D { [NETDEV_NLGRP_PAGE_POOL] =3D { "page-pool", }, }; =20 +static void __netdev_nl_sock_priv_init(void *priv) +{ + netdev_nl_sock_priv_init(priv); +} + +static void __netdev_nl_sock_priv_destroy(void *priv) +{ + netdev_nl_sock_priv_destroy(priv); +} + struct genl_family netdev_nl_family __ro_after_init =3D { .name =3D NETDEV_FAMILY_NAME, .version =3D NETDEV_FAMILY_VERSION, @@ -208,6 +218,6 @@ struct genl_family netdev_nl_family __ro_after_init =3D= { .mcgrps =3D netdev_nl_mcgrps, .n_mcgrps =3D ARRAY_SIZE(netdev_nl_mcgrps), .sock_priv_size =3D sizeof(struct list_head), - .sock_priv_init =3D (void *)netdev_nl_sock_priv_init, - .sock_priv_destroy =3D (void *)netdev_nl_sock_priv_destroy, + .sock_priv_init =3D __netdev_nl_sock_priv_init, + .sock_priv_destroy =3D __netdev_nl_sock_priv_destroy, }; --=20 2.48.0.rc2.279.g1de40edade-goog