From patchwork Wed Oct 21 09:18:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Ivanov X-Patchwork-Id: 1385462 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=linux-um-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=cambridgegreys.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=LI9ULWIa; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::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 ozlabs.org (Postfix) with ESMTPS id 4CGQ0z2f57z9sRk for ; Wed, 21 Oct 2020 20:19:15 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=di+AEjs4rmxM/6iHPKnStHK30Qibz0tmBnK5x9cD9GU=; b=LI9ULWIaUPI1cOlQV0bz+CL4VI h1F3Yy5e3ilA7E9LN8hJkR9SZl4odnQYaabDA8bll8HGt9KjjrQCj87pW2QSpsQba7+xqrZkTxsTg Ial+tK9E2gebhGRXtIYuIqy9nH6Vg9cgqxUN+fMVMjgtAc7HOFbQe1O71YkQXzkq4uwXQJy5Ah4ZR 2fTIV1Gc/uBL6X9owrgxFniBf0QJ8x9xjHlAYcg4rgBdaJGqSGg7PdDVzvqeVjyieUYi+ES4u75+s i2MV6pHLF+rnJmt2IxiSv/W9UEzsqsedzNNN2FYT1ejHqn6eCgU/Hud7HsYdFvQmUsPNo7ICuFtOf 7qlQdY6A==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kVAH0-0006CT-3X; Wed, 21 Oct 2020 09:19:10 +0000 Received: from ivanoab7.miniserver.com ([37.128.132.42] helo=www.kot-begemot.co.uk) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kVAGy-0006BM-7Y for linux-um@lists.infradead.org; Wed, 21 Oct 2020 09:19:09 +0000 Received: from tun252.jain.kot-begemot.co.uk ([192.168.18.6] helo=jain.kot-begemot.co.uk) by www.kot-begemot.co.uk with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kVAGr-0000TB-C2; Wed, 21 Oct 2020 09:19:01 +0000 Received: from jain.kot-begemot.co.uk ([192.168.3.3]) by jain.kot-begemot.co.uk with esmtp (Exim 4.92) (envelope-from ) id 1kVAGn-0000em-V1; Wed, 21 Oct 2020 10:18:59 +0100 From: anton.ivanov@cambridgegreys.com To: linux-um@lists.infradead.org Subject: [PATCH] um: Remove unnecessary snprintf in umid.c Date: Wed, 21 Oct 2020 10:18:53 +0100 Message-Id: <20201021091853.2459-1-anton.ivanov@cambridgegreys.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Spam-Score: -1.0 X-Spam-Score: -1.0 X-Clacks-Overhead: GNU Terry Pratchett X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201021_051908_275912_7BC96347 X-CRM114-Status: GOOD ( 12.71 ) X-Spam-Score: 0.4 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (0.4 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 SPF_NONE SPF: sender does not publish an SPF Record 0.4 KHOP_HELO_FCRDNS Relay HELO differs from its IP's reverse DNS X-BeenThere: linux-um@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: richard@nod.at, Anton Ivanov Sender: "linux-um" Errors-To: linux-um-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Anton Ivanov 1. We already perform the sprintf inside asprintf when allocating the name for the pid file. There is no need to snprintf it again - this is surplus code which was a leftover from the pre-asprintf version. 2. The new code introduced in 0d4e5ac7e78035950d564e65c38ce148cb9af681 was not returning the same error as the old code upon failure. This makes its behaviour identical with the old code. Signed-off-by: Anton Ivanov --- arch/um/os-Linux/umid.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/arch/um/os-Linux/umid.c b/arch/um/os-Linux/umid.c index 1d7558dac75f..c2d7a755521c 100644 --- a/arch/um/os-Linux/umid.c +++ b/arch/um/os-Linux/umid.c @@ -141,16 +141,7 @@ static inline int is_umdir_used(char *dir) err = asprintf(&file, "%s/pid", dir); if (err < 0) - return 0; - - filelen = strlen(file); - - n = snprintf(file, filelen, "%s/pid", dir); - if (n >= filelen) { - printk(UM_KERN_ERR "is_umdir_used - pid filename too long\n"); - err = -E2BIG; - goto out; - } + return -E2BIG; dead = 0; fd = open(file, O_RDONLY);