From patchwork Tue Apr 9 22:52:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuniyuki Iwashima X-Patchwork-Id: 13623292 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp-fw-80006.amazon.com (smtp-fw-80006.amazon.com [99.78.197.217]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9ADA3757F6 for ; Tue, 9 Apr 2024 22:53:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=99.78.197.217 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712703229; cv=none; b=epxZ24ktv0sRCsU5r5S4W2QHBdcetCeRkzBa2WiM0XyYwJ16cu5yGT47YYLoXWBTv3TTcc5teJ91luuIDty8Lwp3/X8O3Tpqx52nqZp9zttKBuj9W0flmwb/ua3qsPxPLLMkyARtwnJT9ZN02kKTBJJHwIEB37x/jYzSpNiofj4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712703229; c=relaxed/simple; bh=4HmgNfMh8fuok6hn09TbuBodW1FzUfufzUZUTjC65xw=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=uEndCJeYgU4nF0bt77z7diC4IcHhh5U1ya+xNoOPYVfGsiJTCCvHaEUWfc769AEPalyH3bpL3TGMgSP8tYujIh5mLi/fySps/a8A8Ke/mcxRdeEow9eFSWpK9qs0zQQYdHQWLaKoreEQusK1b5HFRagdBs4fOwM3GNT5kWiooEE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.com; spf=pass smtp.mailfrom=amazon.co.jp; dkim=pass (1024-bit key) header.d=amazon.com header.i=@amazon.com header.b=lATJ68EL; arc=none smtp.client-ip=99.78.197.217 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=amazon.co.jp Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amazon.com header.i=@amazon.com header.b="lATJ68EL" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1712703228; x=1744239228; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=sQeDHEHqLBFN8588bgL2rXw+BYg4fC2ZXoFvUPuAa3I=; b=lATJ68ELFR6Q4JH4MI5YZA5BRIOVLRfzMkd5r+0uBub26D8Fc+eJvt1U DlaIxMWQ8Us5aXtgGbAdNR1GT6YJlQPmCS29b7dtTeXvhAhjfvOdCbAqt CpvJp4pJUm3Dz2o1vs7dr0XfcN7j2ZjxSYCiWFnqkHLEjSaEmtOhsfuID M=; X-IronPort-AV: E=Sophos;i="6.07,190,1708387200"; d="scan'208";a="286468105" Received: from pdx4-co-svc-p1-lb2-vlan3.amazon.com (HELO smtpout.prod.us-west-2.prod.farcaster.email.amazon.dev) ([10.25.36.214]) by smtp-border-fw-80006.pdx80.corp.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Apr 2024 22:53:45 +0000 Received: from EX19MTAUWC001.ant.amazon.com [10.0.38.20:35717] by smtpin.naws.us-west-2.prod.farcaster.email.amazon.dev [10.0.12.255:2525] with esmtp (Farcaster) id 912aca76-2cda-4a36-b647-12315ee3860b; Tue, 9 Apr 2024 22:53:44 +0000 (UTC) X-Farcaster-Flow-ID: 912aca76-2cda-4a36-b647-12315ee3860b Received: from EX19D004ANA001.ant.amazon.com (10.37.240.138) by EX19MTAUWC001.ant.amazon.com (10.250.64.174) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.28; Tue, 9 Apr 2024 22:53:44 +0000 Received: from 88665a182662.ant.amazon.com (10.106.100.45) by EX19D004ANA001.ant.amazon.com (10.37.240.138) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.28; Tue, 9 Apr 2024 22:53:41 +0000 From: Kuniyuki Iwashima To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni CC: Rao shoaib , Kuniyuki Iwashima , Kuniyuki Iwashima , Subject: [PATCH v1 net 3/3] af_unix: Prepare MSG_OOB deprecation. Date: Tue, 9 Apr 2024 15:52:09 -0700 Message-ID: <20240409225209.58102-4-kuniyu@amazon.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20240409225209.58102-1-kuniyu@amazon.com> References: <20240409225209.58102-1-kuniyu@amazon.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: EX19D041UWB004.ant.amazon.com (10.13.139.143) To EX19D004ANA001.ant.amazon.com (10.37.240.138) X-Patchwork-Delegate: kuba@kernel.org Commit 314001f0bf92 ("af_unix: Add OOB support") introduced MSG_OOB support for AF_UNIX, and it's about 3 years ago. Since then, MSG_OOB is the playground for syzbot. MSG_OOB support is guarded with CONFIG_AF_UNIX_OOB, but it's enabled by default and cannot be disabled without editing .config manually because of the lack of prompt. We recently found 3 wrong behaviours with basic functionality that no one have noticed for 3 years, so it seems there is no real user and even the author is not using OOB feature. [0] This is a good opportunity to drop MSG_OOB support. Let's switch the default config to n and add warning so that someone using MSG_OOB in a real workload can notice it before MSG_OOB support is removed completely. Link: https://lore.kernel.org/netdev/472044aa-4427-40f0-9b9a-bce75d5c8aac@oracle.com/ [0] Fixes: 314001f0bf92 ("af_unix: Add OOB support") Signed-off-by: Kuniyuki Iwashima --- Added Fixes tag so that it can be backported to corresponding stable kernels. --- net/unix/Kconfig | 4 ++-- net/unix/af_unix.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/net/unix/Kconfig b/net/unix/Kconfig index 8b5d04210d7c..9d9270fdc1fe 100644 --- a/net/unix/Kconfig +++ b/net/unix/Kconfig @@ -17,9 +17,9 @@ config UNIX Say Y unless you know what you are doing. config AF_UNIX_OOB - bool + bool "Unix MSG_OOB support" depends on UNIX - default y + default n config UNIX_DIAG tristate "UNIX: socket monitoring interface" diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 9a6ad5974dff..fecca27aa77f 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -2253,6 +2253,8 @@ static int unix_stream_sendmsg(struct socket *sock, struct msghdr *msg, err = -EOPNOTSUPP; if (msg->msg_flags & MSG_OOB) { #if IS_ENABLED(CONFIG_AF_UNIX_OOB) + pr_warn_once("MSG_OOB support will be removed in 2025.\n"); + if (len) len--; else