Received-SPF: pass (google.com: domain of linux-kernel+bounces-46260-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
From: John Garry <john.g.garry@oracle.com>
To: mcgrof@kernel.org, russ.weight@linux.dev, gregkh@linuxfoundation.org,
        rafael@kernel.org, rostedt@goodmis.org, mhiramat@kernel.org,
        mathieu.desnoyers@efficios.com, davem@davemloft.net,
        edumazet@google.com, kuba@kernel.org, pabeni@redhat.com,
        keescook@chromium.org, masahiroy@kernel.org, nathan@kernel.org,
        nicolas@fjasle.eu
Cc: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org,
        netdev@vger.kernel.org, linux-kbuild@vger.kernel.org,
        John Garry <john.g.garry@oracle.com>
Subject: [PATCH RFC 4/4] firmware_loader: Use uts_release
Date: Wed, 31 Jan 2024 10:48:51 +0000
Message-Id: <20240131104851.2311358-5-john.g.garry@oracle.com>
In-Reply-To: <20240131104851.2311358-1-john.g.garry@oracle.com>
References: <20240131104851.2311358-1-john.g.garry@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: 
	=?us-ascii?Q?NTUhIGthGuMujUvVo84YYT9WK+TaLTe+EUCcw7xC5OxKJ1SE9lJa7yX7+jRo?=
 =?us-ascii?Q?WrxM/8x4amNhnQzmLSu6CRDTXId9YsvFcvKzjONupRU26oKbeYhWSnwalgaw?=
 =?us-ascii?Q?fxA84GkXgAl4aHawtFh+k8gBXVuRYKhaf8mfaXQuaCV2Ib7HG0nIUgN65xK0?=
 =?us-ascii?Q?oxFy694DYDmg1m7DDx1ImbD0b/+VgGPJD05Z61c7wCItcLHCZSx3SWSr7+4V?=
 =?us-ascii?Q?09K4M4XIFHOpa75QeUkCGQAeTdS1S1/WAdCPpCrh5jxhu/Z8HvrqHRNDKguw?=
 =?us-ascii?Q?2yvyTs6uupkmUQAqq1lg7tK0IUlKvV1d2WRLB1kb7xbmOvq72tSCUQ2OMUQi?=
 =?us-ascii?Q?7PBEIkr4qgi8dm2sSleLy/vhU/YEQR6+5iD4nohaVu72+cvwpr5UmeoYaTgv?=
 =?us-ascii?Q?jA+LCQlwHXv4O95fVIoPCTwcAZ9EKlJxGhUzJLEZdiKDbpq0+3r4/9iJX/nW?=
 =?us-ascii?Q?SI7FfwQSigg9vauILbArqPguRuXiEenkqiIMD7bCahTD7Y6/sCbVtCmpwHwW?=
 =?us-ascii?Q?YP7EIAoVCo4uepheym0qMzNIc2LWnoYut+j1EXR1vzq1P46fobCI0o7HsT0N?=
 =?us-ascii?Q?zp7VWJ2DYWDcVrTyALNJcHmfF3ixT31DpyemYb3zdCFEDGPMDkjiVZjZTJC4?=
 =?us-ascii?Q?I81OFcZsQZaDbcJ7cHG5uUFmC4JzWT6HnsOJM8pkxTVQ+Gqw7Z7I+doU83i7?=
 =?us-ascii?Q?kmFIbvVtALPwRpttzo/BwGsspNLQCxG8BwMajuX6rjU7Qk881BFsWiZvIW0P?=
 =?us-ascii?Q?rkr+oYhWVkymrRKiENdfOr4eBYjG9GiRpfzy4wSOCKBZnbwryaY64FmqC+Pc?=
 =?us-ascii?Q?bOSWkeO3uPTV3HNGnhTgm10AAAK259ubWk5JjIgIz+FZI/s/Twlxdhs6hhsF?=
 =?us-ascii?Q?4oBCwXqQEIG4TXAMeFjWrdemM6bbIrk7RIpSXrnTteBrsOb00RV2EnYNT8Of?=
 =?us-ascii?Q?JDAnL97TXUSBnS0Caauk/Eb5qXIgN4nLRMsQuIlcQPt0mOSTeiGBeh5WsPtR?=
 =?us-ascii?Q?fUlt5Nm+rLIkFUBv1PAKy9SHZi3xmTvAnjIt4/0LgNWbq2TBB53WzqpELH0O?=
 =?us-ascii?Q?ABDzQz+8Ax/62PwkX9JBto6wSV9tsETCd+K6zJsuhVRwb70EMWu1sK7KBhi2?=
 =?us-ascii?Q?ItKfTxVHem7VjVlTGUFVE1BO3TnFMJfJL3lt3d/qP6H+Md3kE+IbhpOzXF76?=
 =?us-ascii?Q?qT0znTtjUyVPLsEPTA/3UWeZKKaukhyG8h1bJPy1PKlI4Fp7xSuNJfnEje2Z?=
 =?us-ascii?Q?o7YMgvlYmAPSLAyo7PmV38f0yNA8yRSYGsfWbEm/lxT3XA10i3nmujNHN1GJ?=
 =?us-ascii?Q?OSs++It0HT5ZnNg3cSEBG6K7Ueb+c2UUq6Y3dmbS7JImGnLXT0pu9JDOFmi3?=
 =?us-ascii?Q?oeMXGb3JX9rFeUt3kta9I9I/TRMwMOUHblXgUJsFKG+UQKaiggWsUjCkhWev?=
 =?us-ascii?Q?wM9W4S+b9RlGgEU/aavL/utqbkhytLEGfVdIvwJaMV5TYL3BJxSHB20iTKTR?=
 =?us-ascii?Q?LdQcwItg+FqqiPiISGvLUrVQwYFpZFfuOu3CZNUh9FUMKflJXOGufxiuj0US?=
 =?us-ascii?Q?5/uzDyxs/EQ+WioKch5M/rpIf96bWpdic+rbVXeE9ELVYBxnw49tOWuU3eiP?=
 =?us-ascii?Q?pg=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	UKdPI2zLhFS8/ZmlA9LtpLZW+CDD/fDOU58361sEQ+9HV0jHTRgRbn/TPFPVYMTSE5yqrV8zQitLW8X8Z2/ACsoR49/xpAPZ8HGDEaifmhh/WAMGeRaQnbR3PJTd7wdbxls2fOBXnC4oG8R+Hkyq78irhlw1CrFFaDoLHD6/j9zbtj2P/Oi/4G6Zprw+DDzB7qJbeQlQK5tuaR7JxjtD472Kolsgb7AyU76gS1Ol3GimEJ7rx+JCjk2LbFTb/1sOA1KTtvAh5fPF8yGJOAk3QUl4Qm0RRyKVuvSvQWatYBtSEop2B54Up9kJeRiMBvM4Ml5cyv0DgzDK2PPBDSBjQN/ltp6V+5iABV8rc4WdBmPsgdIPlDU1f6pZbUkuQAlv59ngVY/FLHKKI5JaTXJ3hJL+yQp/XfEInS4lJRzL2f0fD93JAMKHG0kNYblXyMBffHMvUPqSA0HAD/dozwwM10RIlO6IQhF7nK3+xEF5/DmjHp5Ixb5wyD8edO2wnBNhYf4Oh0RLjO5zwaKYSywzQX7hFiogrPkv00Htgz0VsA8sawjj5cWdASJThLrqKI5DRcpewZv8jqfIIyKkb9zuyuNcGyEkuzYk1Z0aSOlxF5o=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8d5c2554-8653-43f4-9261-08dc224a4588
X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jan 2024 10:49:17.0775
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: FXZqAdvGyyQiOz28QSrdeXgG3vjNn16axbUNSTln5gK+4sExkrPLdEtMN/Ns5Z14H1Pz4MRynA9MyviQ82c4OQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR10MB7323
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26
 definitions=2024-01-31_05,2024-01-30_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 phishscore=0 malwarescore=0
 spamscore=0 mlxlogscore=999 adultscore=0 bulkscore=0 suspectscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000
 definitions=main-2401310082
X-Proofpoint-GUID: MnMwAmFC07av7qcK0i4uhlvlXW7OVANc
X-Proofpoint-ORIG-GUID: MnMwAmFC07av7qcK0i4uhlvlXW7OVANc

Instead of using UTS_RELEASE, use uts_release, which means that we don't
need to rebuild the code just for the git head commit changing.

Since UTS_RELEASE was used for fw_path and this points to const data,
append uts_release dynamically to an intermediate string.

Signed-off-by: John Garry <john.g.garry@oracle.com>
---
 drivers/base/firmware_loader/main.c | 39 +++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/drivers/base/firmware_loader/main.c b/drivers/base/firmware_loader/main.c
index ea28102d421e..87da7be61a29 100644
--- a/drivers/base/firmware_loader/main.c
+++ b/drivers/base/firmware_loader/main.c
@@ -38,7 +38,7 @@
 #include <linux/zstd.h>
 #include <linux/xz.h>
 
-#include <generated/utsrelease.h>
+#include <linux/utsname.h>
 
 #include "../base.h"
 #include "firmware.h"
@@ -471,9 +471,9 @@ static int fw_decompress_xz(struct device *dev, struct fw_priv *fw_priv,
 static char fw_path_para[256];
 static const char * const fw_path[] = {
 	fw_path_para,
-	"/lib/firmware/updates/" UTS_RELEASE,
+	"/lib/firmware/updates/", /* UTS_RELEASE is appended later */
 	"/lib/firmware/updates",
-	"/lib/firmware/" UTS_RELEASE,
+	"/lib/firmware/", /* UTS_RELEASE is appended later */
 	"/lib/firmware"
 };
 
@@ -496,7 +496,7 @@ fw_get_filesystem_firmware(struct device *device, struct fw_priv *fw_priv,
 	size_t size;
 	int i, len, maxlen = 0;
 	int rc = -ENOENT;
-	char *path, *nt = NULL;
+	char *path, *fw_path_string, *nt = NULL;
 	size_t msize = INT_MAX;
 	void *buffer = NULL;
 
@@ -510,6 +510,12 @@ fw_get_filesystem_firmware(struct device *device, struct fw_priv *fw_priv,
 	if (!path)
 		return -ENOMEM;
 
+	fw_path_string = __getname();
+	if (!fw_path_string) {
+		__putname(path);
+		return -ENOMEM;
+	}
+
 	wait_for_initramfs();
 	for (i = 0; i < ARRAY_SIZE(fw_path); i++) {
 		size_t file_size = 0;
@@ -519,16 +525,32 @@ fw_get_filesystem_firmware(struct device *device, struct fw_priv *fw_priv,
 		if (!fw_path[i][0])
 			continue;
 
+		len = snprintf(fw_path_string, PATH_MAX, "%s", fw_path[i]);
+		if (len >= PATH_MAX) {
+			rc = -ENAMETOOLONG;
+			break;
+		}
+
+		/* Special handling to append UTS_RELEASE */
+		if (fw_path[i][len - 1] == '/') {
+			len = snprintf(fw_path_string, PATH_MAX, "%s%s",
+					fw_path[i], uts_release);
+			if (len >= PATH_MAX) {
+				rc = -ENAMETOOLONG;
+				break;
+			}
+		}
+
 		/* strip off \n from customized path */
-		maxlen = strlen(fw_path[i]);
+		maxlen = strlen(fw_path_string);
 		if (i == 0) {
-			nt = strchr(fw_path[i], '\n');
+			nt = strchr(fw_path_string, '\n');
 			if (nt)
-				maxlen = nt - fw_path[i];
+				maxlen = nt - fw_path_string;
 		}
 
 		len = snprintf(path, PATH_MAX, "%.*s/%s%s",
-			       maxlen, fw_path[i],
+			       maxlen, fw_path_string,
 			       fw_priv->fw_name, suffix);
 		if (len >= PATH_MAX) {
 			rc = -ENAMETOOLONG;
@@ -585,6 +607,7 @@ fw_get_filesystem_firmware(struct device *device, struct fw_priv *fw_priv,
 		break;
 	}
 	__putname(path);
+	__putname(fw_path_string);
 
 	return rc;
 }
-- 
2.35.3