From patchwork Sun Jun 4 13:12:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 102995 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2151586vqr; Sun, 4 Jun 2023 06:57:39 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6PvZ/4o3kq8O0mqDYrMrMyXiZiST/zL4obpWC04auEuB9FyGbPmf/jPP2NEq4N5LN/qyTD X-Received: by 2002:a17:90b:4f46:b0:255:614a:7fae with SMTP id pj6-20020a17090b4f4600b00255614a7faemr4710110pjb.20.1685887058975; Sun, 04 Jun 2023 06:57:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685887058; cv=none; d=google.com; s=arc-20160816; b=PH+XwWJxf8V5urnsiczFWo5lbixJvQ4tw+5uDSnB+myTZLXPBeKZt1xuYQ+CCTy3we r8TJmMfki1iKaK1VfXNQTMquS7z2H1zti3W2xH4lLbMcZW29zVUgctwwnzchY/ynczPz GGz4WoWdxRkacuQcq0g8tL6S7kCXVOM/jEtAMQKauKNSIKoIOVi72GOhHv4XHCL/VFMu fs/uU97lWbLqfAlv5M+EE63joWD2KvIZMZK6BJPYx7QOemtj0Xllb/zA911hR2I+MeQ1 f75A+sodYb0HPejqQWs0M1YlcLXrRTK0SLNUrnjnlZi6O+71tJb0V1OVZLjVEDNO8qIl 4vWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=nG6pO9VRnqP3MkdEL4BdlEeDmOy+AXKXLliQf+ZdukQ=; b=RvMdKnN5rVEYoDChnDeGIEuTc8hL7jgWCw9ri0dNljUsGeBAAH89drLUwQwZBIgqds GK2C6tuPIs8mAr4GAwMxOYTazMyimL7caVc76HGktOWMu+slw+rbY2bHj+Gx4dN9BbpS eJLLP09j6fytJWrjx1XPbsbzHjBgCFMY+bCwuV60x5Qb2jMZFQQxjLMhzpj6tumZlPV3 /hT0uyZdsbDHHWdiOsxLzGWJLunTJ0SJ2sPRO7M/CvE+DK4in8lbPfcMKPRkTDz9FOX+ yc6n8AsH/a3DzFfVjyEhLNsNKcNyX0oV9LJV7QUAXsomLc9yLzanLNjGTAgvNeFjLq3N baOQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=iXAUuG4a; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k66-20020a633d45000000b00512fab9493dsi4307975pga.740.2023.06.04.06.57.25; Sun, 04 Jun 2023 06:57:38 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=iXAUuG4a; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231767AbjFDNMP (ORCPT + 99 others); Sun, 4 Jun 2023 09:12:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37134 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229788AbjFDNMN (ORCPT ); Sun, 4 Jun 2023 09:12:13 -0400 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B1622B8; Sun, 4 Jun 2023 06:12:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1685884332; x=1717420332; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=dO9+hudmBeE13l32Rylh0J5QaZhOfbdLqdQbEuq7Ixc=; b=iXAUuG4aunE4Pky+EBDpPBfr+J6bAZFwYXMJ38YAKd4QXpAvDzQCXmxb ZTWvrLuLdPQV8kh5Xln0Ssvmt4mLq12I/5UdeRiKDxAwr36/TFAPdchMI CEkVg3w5N3NXdcyuoImJOuwzGKd3GKUdg5FPNEdJMafHdX98sE33nR9hJ G468H2BSCcafkaLlS0X8Tzd+J52TnerK7ce2AyHiDFw2N4VVr+/k1esQ6 PFbhiGIeNGxkZoHMpufXWw2DuOv/N/FKpP/V4z+fYPtXAYRaiWYfiTKJa o4i+m6ik2LV7B36exO+8EDZXp4+a50VjtH04LlnmAPjvLD6vgfU20UzPE A==; X-IronPort-AV: E=McAfee;i="6600,9927,10731"; a="422008643" X-IronPort-AV: E=Sophos;i="6.00,217,1681196400"; d="scan'208";a="422008643" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Jun 2023 06:12:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10731"; a="778251865" X-IronPort-AV: E=Sophos;i="6.00,217,1681196400"; d="scan'208";a="778251865" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga004.fm.intel.com with ESMTP; 04 Jun 2023 06:12:10 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 2F082204; Sun, 4 Jun 2023 16:12:17 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Linus Walleij Subject: [PATCH v1 1/2] pinctrl: Duplicate user memory in one go in pinmux_select() Date: Sun, 4 Jun 2023 16:12:14 +0300 Message-Id: <20230604131215.78847-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767780708877803457?= X-GMAIL-MSGID: =?utf-8?q?1767780708877803457?= Current code is suboptimal in three ways: 1) it explicitly terminates the string which is not needed; 2) it might provoke additional faults, because asked lenght might be bigger than the real one; 3) it consumes more than needed lines in the source. Instead of using kmalloc() + strncpy_from_user() + terminating, just utilize memdup_user_nul(). Signed-off-by: Andy Shevchenko --- drivers/pinctrl/pinmux.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/pinctrl/pinmux.c b/drivers/pinctrl/pinmux.c index 021382632608..2d2f3bd164d5 100644 --- a/drivers/pinctrl/pinmux.c +++ b/drivers/pinctrl/pinmux.c @@ -692,14 +692,9 @@ static ssize_t pinmux_select(struct file *file, const char __user *user_buf, if (len > PINMUX_SELECT_MAX) return -ENOMEM; - buf = kzalloc(PINMUX_SELECT_MAX, GFP_KERNEL); - if (!buf) - return -ENOMEM; - - ret = strncpy_from_user(buf, user_buf, PINMUX_SELECT_MAX); - if (ret < 0) - goto exit_free_buf; - buf[len-1] = '\0'; + buf = memdup_user_nul(user_buf, len); + if (IS_ERR(buf)) + return PTR_ERR(buf); /* remove leading and trailing spaces of input buffer */ gname = strstrip(buf); From patchwork Sun Jun 4 13:12:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 102993 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2141160vqr; Sun, 4 Jun 2023 06:29:11 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6ojK7CjBdZS4qTnEBe7VZSCudyt26GdTb7m0+5K57Hh3Uyi6eaN55YqTp1ZKmcW8VrES+Y X-Received: by 2002:a17:902:f685:b0:1af:b92d:b5fe with SMTP id l5-20020a170902f68500b001afb92db5femr6215581plg.0.1685885350759; Sun, 04 Jun 2023 06:29:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685885350; cv=none; d=google.com; s=arc-20160816; b=PrCqkQFTOweEGHcD8J3ALywsmK1ka2D/zT8HyHMWbm5BwEkCHsOM0/HgNS+P462PBw lgSJBDj6BqSyEF66FlBpxD1nSWkllmfHIibvdkHgQwDa0EyLFDHtYUhvWm3iUkSebJ/y 5tg0XMpZpmuPyVNVCDhjWDGxJK0Eiz0WxP4urd4D7LEpTID2gSdBlfD/okiOGn6Dgh7u QDkKrxgPPdhOn+vUwafZLvLl+etksZEtJi7B0n8P6uvkz1dI3nQ6ggp+XYYVem5HQS5I dlWTKMEdcD3wQBOaevkBhv2wVTcwRVE7gCXl3c1tqP6rf499MTaXQdZpYOZ0+outJDoa S77Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=X0MDlKF81xttyNk8qOLv823Jp1xEdupisXcPM+en/hU=; b=QeiliT3BhzyJZruGCLtjLssDEblm+FjPdicu60G6qOGnVq8ILJmIsoM4r6nfuqsJCH V2daBPriYyUbijBsRBYD9fp8qGm2IIrufpl4HoJJLC9oiGlnGA9PlkkMstu1wrZW9vRj 7BgOWN6rliWZS0tuSv3nujI9GINSMNoJiqxNX4DVeGggiRYYEgRY2Auqoiy2oq7p9tXH grNtI/qCstjr+ppZn4BevhNIbQvUSc1J3tfW1FDT+OVpFl8UmSLY7JCcfs7Nujn/Wn6y /fh0RWtLHamg5qdKSYctyMiCvCu62qtuQnIVuOkk8tKXSriqoVme/WJd9Us974tNzsHN OC6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=IrBDL5qQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l12-20020a170902d34c00b001ac6189cac3si3946487plk.187.2023.06.04.06.28.59; Sun, 04 Jun 2023 06:29:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=IrBDL5qQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231944AbjFDNMR (ORCPT + 99 others); Sun, 4 Jun 2023 09:12:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37140 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230487AbjFDNMO (ORCPT ); Sun, 4 Jun 2023 09:12:14 -0400 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AE84BCA; Sun, 4 Jun 2023 06:12:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1685884333; x=1717420333; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=5vg61FkTTaqJtLcNTfO3vDFQp7XbtULOPcw177woejk=; b=IrBDL5qQtkpLI0y1HgvscPKxqGxzgIYD2r0705Jmsj7Zwntx5Uh05epQ 3k4obwcy8dTjjYq8ONPVGBNgThcKfig5Q29XP+QPPQ7lStBgX9gKqrgIe tPSRX4qVgL7X//DWhbpwj6xWs9ATyfsGgL5NgpqknjcQBAguQjQI+bKbm 8MJLehGtPJfM6TewBDvYb3fAsHUJj0dWKuSRl+S0hCI41SemOLzBx2vMb JlOmHTWsmgVqwh3HtlA71ibdPhyv7hcH1S7UUyjMmjzuDvaKvtYdiO/tD oNEVbAK4+Xn2ASG2/X13kJ/4VGx2WFv0gJubPuKf/MmCnrsxu9QQz985Q A==; X-IronPort-AV: E=McAfee;i="6600,9927,10731"; a="422008645" X-IronPort-AV: E=Sophos;i="6.00,217,1681196400"; d="scan'208";a="422008645" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Jun 2023 06:12:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10731"; a="778251867" X-IronPort-AV: E=Sophos;i="6.00,217,1681196400"; d="scan'208";a="778251867" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga004.fm.intel.com with ESMTP; 04 Jun 2023 06:12:11 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id D02A72A6; Sun, 4 Jun 2023 16:12:17 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Linus Walleij Subject: [PATCH v1 2/2] pinctrl: Relax user input size in pinmux_select() Date: Sun, 4 Jun 2023 16:12:15 +0300 Message-Id: <20230604131215.78847-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230604131215.78847-1-andriy.shevchenko@linux.intel.com> References: <20230604131215.78847-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767778917705876173?= X-GMAIL-MSGID: =?utf-8?q?1767778917705876173?= This is debugfs and there is no much sense to strict the user from sending as much data as they can. The memdup_user_nul() will anyway fail if there is not enough memory. Relax the user input size by removing an artificial limitaion. Signed-off-by: Andy Shevchenko --- drivers/pinctrl/pinmux.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/pinctrl/pinmux.c b/drivers/pinctrl/pinmux.c index 2d2f3bd164d5..82c750a31952 100644 --- a/drivers/pinctrl/pinmux.c +++ b/drivers/pinctrl/pinmux.c @@ -677,7 +677,6 @@ void pinmux_show_setting(struct seq_file *s, DEFINE_SHOW_ATTRIBUTE(pinmux_functions); DEFINE_SHOW_ATTRIBUTE(pinmux_pins); -#define PINMUX_SELECT_MAX 128 static ssize_t pinmux_select(struct file *file, const char __user *user_buf, size_t len, loff_t *ppos) { @@ -689,9 +688,6 @@ static ssize_t pinmux_select(struct file *file, const char __user *user_buf, unsigned int num_groups; int fsel, gsel, ret; - if (len > PINMUX_SELECT_MAX) - return -ENOMEM; - buf = memdup_user_nul(user_buf, len); if (IS_ERR(buf)) return PTR_ERR(buf);