From patchwork Wed Dec 6 03:19:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 174286 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp3856166vqy; Tue, 5 Dec 2023 19:19:59 -0800 (PST) X-Google-Smtp-Source: AGHT+IHLMdDeRq9bAJZnurQ99Sjbn8ur0po9JyCVwcG4bIioYIdfM0WCqc3M0EzQ6gP9xh6vuJ92 X-Received: by 2002:a05:6a20:f382:b0:18f:97c:3860 with SMTP id qr2-20020a056a20f38200b0018f097c3860mr331622pzb.58.1701832798496; Tue, 05 Dec 2023 19:19:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701832798; cv=none; d=google.com; s=arc-20160816; b=f+2Co+zofImULwPuAJ9yPuik99l0Re/WMjMEaq9Ct6qkiotYgqHjyLqXOn5B+kIFzN NqKPLENwtqwy7mYAPNSC0yCKppjMYQulHNrnYPmsalTOut8BWocQA78y0Q8VSavozuSN J0XMievq9qZSQBtlVIGeguSNTQ/XtwTRnj5Dpt7peZWVZgqXsziTiuaISvl8nC0iTa4O 0FFMzFF4J5Nl+08YccmsYezBbwtHLPfowFycG4/APaPPHd9thCl1rzxibCf2J0rLqYZ6 KPHmjfv2eqHmM4asKZBwdHcwUFRqy0/FLz9dg/NfTVqusOUBX++u2rRgYw+ccmXmtdRn uIPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=+R+s2ipByf0kO1/SdWPDOgyoSLgIykmCOvBVAxkRneQ=; fh=f4rI7BJQtZxA/5PDHASiVgaE+zKnGLLx4kunCEqzQ4A=; b=PIOq1RKJg8BdzcPByEe52fNM7E4zwb7xZtMuTfTmvgFQ1NkYvq7QEPwnf6GRUXfNkW XTnjQbulS+ahWC/MufKylCdRdvk5G6V5fl+vYGa8B53HDEUVVbR9BiUUTfbeImWbgwkh vJbsC/fghz45gcJ5MsJi3aXwZ4iVSSxIVjcuGXa6wk8ZTdK7Sn2Hwl2arcC0omB6IUkb vwv/GhEMVuAAMEBcRjqKSTuKrMIx6wFKUcOP4uiJyvg/qAgwlYnx3FGo2q4ic3n11D/O 5TOzPC/V+avOSgGi2hL4HrGt2q4fOjRIuIcBoH0iJkHuIwGcqRwvYgMppv/BdwspzUXg R+dg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=Ij6HNPIo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id a38-20020a056a001d2600b006ce6ef58aa4si2010588pfx.344.2023.12.05.19.19.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Dec 2023 19:19:58 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=Ij6HNPIo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id AC299823365B; Tue, 5 Dec 2023 19:19:55 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229577AbjLFDTi (ORCPT + 99 others); Tue, 5 Dec 2023 22:19:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51498 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229493AbjLFDTh (ORCPT ); Tue, 5 Dec 2023 22:19:37 -0500 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B5F171AA; Tue, 5 Dec 2023 19:19:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1701832782; bh=+R+s2ipByf0kO1/SdWPDOgyoSLgIykmCOvBVAxkRneQ=; h=Date:From:To:Cc:Subject:From; b=Ij6HNPIowYy/6i5442tBv3d5GM12UElTdJjFvI7uwnQe0ahUCrvgRN25MMf/7eVEJ mA6ZaEXcMwdyPrYkIiIAGHtj6XONU2FNECwzjgHRcjb9akzQV7jUWP6vusrQYz77pd bwuzHAYBW9wUeqP9PD5WqgbWEI7X4OptzWRRPh9p9eLHiDg+O+yijRYJTYbgnGmjKV nh7zVGJuSMtCPlsX8nHoe9SHpzUTClrzdspwSpiNEB2+VyaeSNXMnNidmhgno3qM56 Lq/19zBcuJAWvL/vwfShasA7TeJzr7elX1WM2Q+sEaqoj21Fo1KFj0Jnr99WXNven9 94ueZgHt+QkzA== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4SlN1T6Tm1z4wd7; Wed, 6 Dec 2023 14:19:41 +1100 (AEDT) Date: Wed, 6 Dec 2023 14:19:41 +1100 From: Stephen Rothwell To: Luis Chamberlain , "Eric W. Biederman" Cc: Thomas =?utf-8?q?Wei=C3=9Fschuh?= , Alexey Gladkov , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build failure after merge of the sysctl tree Message-ID: <20231206141941.3ed51cb1@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on howler.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Tue, 05 Dec 2023 19:19:55 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784501028578483550 X-GMAIL-MSGID: 1784501028578483550 Hi all, After merging the sysctl tree, today's linux-next build (powerpc ppc64_defconfig) failed like this: ipc/mq_sysctl.c:115:24: error: initialization of 'int (*)(struct ctl_table_header *, const struct ctl_table *)' from incompatible pointer type 'int (*)(struct ctl_table_header *, struct ctl_table *)' [-Werror=incompatible-pointer-types] 115 | .permissions = mq_permissions, | ^~~~~~~~~~~~~~ ipc/mq_sysctl.c:115:24: note: (near initialization for 'set_root.permissions') ipc/mq_sysctl.c:116:26: error: initialization of 'void (*)(struct ctl_table_header *, const struct ctl_table *, kuid_t *, kgid_t *)' from incompatible pointer type 'void (*)(struct ctl_table_header *, struct ctl_table *, kuid_t *, kgid_t *)' [-Werror=incompatible-pointer-types] 116 | .set_ownership = mq_set_ownership, | ^~~~~~~~~~~~~~~~ ipc/mq_sysctl.c:116:26: note: (near initialization for 'set_root.set_ownership') Caused by commits a6dd7f5a787b ("sysctl: treewide: constify ctl_table_root::permissions") a56545552ecf ("sysctl: treewide: constify ctl_table_root::set_ownership") interacting with commit 7608b6a72ed0 ("sysctl: Allow to change limits for posix messages queues") from the userns tree. I have applied the following merge resolution patch. From: Stephen Rothwell Date: Wed, 6 Dec 2023 14:12:02 +1100 Subject: [PATCH] fixup for "sysctl: treewide: constify ctl_table_root::permissions" and "sysctl: treewide: constify ctl_table_root::set_ownership" interacting with "sysctl: Allow to change limits for posix messages queues". Signed-off-by: Stephen Rothwell --- ipc/mq_sysctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ipc/mq_sysctl.c b/ipc/mq_sysctl.c index 69c709262f5a..850dfc83af23 100644 --- a/ipc/mq_sysctl.c +++ b/ipc/mq_sysctl.c @@ -78,7 +78,7 @@ static int set_is_seen(struct ctl_table_set *set) } static void mq_set_ownership(struct ctl_table_header *head, - struct ctl_table *table, + const struct ctl_table *table, kuid_t *uid, kgid_t *gid) { struct ipc_namespace *ns = @@ -91,7 +91,7 @@ static void mq_set_ownership(struct ctl_table_header *head, *gid = gid_valid(ns_root_gid) ? ns_root_gid : GLOBAL_ROOT_GID; } -static int mq_permissions(struct ctl_table_header *head, struct ctl_table *table) +static int mq_permissions(struct ctl_table_header *head, const struct ctl_table *table) { int mode = table->mode; kuid_t ns_root_uid;