From patchwork Mon Jan 29 14:15:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodrigo Campos X-Patchwork-Id: 193502 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2087:b0:106:209c:c626 with SMTP id gs7csp599958dyb; Mon, 29 Jan 2024 06:26:06 -0800 (PST) X-Google-Smtp-Source: AGHT+IEY6IG4Fkfhw6+4ZHdxnhiwgFmZVsiQ1lxOv4sDYQwQS3EdkHnFX/BLu/4iYfd9XVP/OwNm X-Received: by 2002:a05:6808:11c1:b0:3bd:5347:941f with SMTP id p1-20020a05680811c100b003bd5347941fmr5822769oiv.59.1706538366026; Mon, 29 Jan 2024 06:26:06 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706538365; cv=pass; d=google.com; s=arc-20160816; b=kMoHygTpf5MfjSJA+HGMixJOOOBhLcOvwf3xiO4rEleGaH8An1lBG7Oj9gAbrX1Bpr 4/e8guoEVksc5Pkc2p/1d6SYLF+B6iORYwOyU4yoOepv0f3yWIjRH27MZ0Wjy5tSmOaz viYV5bpW2AGAxbK2Rge8B04wrO+XWD1RAODinqqlNahjlWCy8oYXP6dRe78XxWds1mEW WF1vA2eTgMcoF9xckLP+Ja4h7w8DChtEqE1IIT0ptEa6ndnvQFM7hwf5EIptEUCItsd+ CkvBl1HeA1U6l48JiHunW9xVcl4Ad6aEfbVyl9fIggd+VdHZy/ujmB4FbME/P9d4Jvkh v8WQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=HmbJMSA+rDrUIPzrZfECGQfunbWYzs60GG/4g7pvyeo=; fh=1pO/fnqlbA1DlSshLp2Kp23nBXobkeZ558bQEuNU3Z8=; b=awykDpTOGxLaBdVQu4HNb6kAtZb2jesb7Q8Z8hXbO1b6XkZla7GnwvuYC+mIq0rGya EvVnSPgB8U0IZCZ79wZ+BdzpKg6epHqjTK72Mx7D2HG/uMHEyJK9wEdAMTQr/3eJYT8o bmEjwn05CbcBKbzI1fLdq6kDSqKQnfLKWP+v+xzxsokGoHSKNDgOpXVtAoFsVLsuuaYS rj69dkdcpWGP2PCku7TjAOYiCdmyur5HXNnq5lfGlCMav/CTViiXiRWRn4lV+i6aTpM9 9o0bPxSb2oep52ip5DLX5f7ic0czsfR9feBX2TN//MSPTtFcpDSOlimcH3wMn2oNu/cL UxMA== ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=sdfg.com.ar); spf=pass (google.com: domain of linux-kernel+bounces-42866-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-42866-ouuuleilei=gmail.com@vger.kernel.org" Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id q12-20020a056a00084c00b006dbac97dfccsi5927148pfk.141.2024.01.29.06.26.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jan 2024 06:26:05 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-42866-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=sdfg.com.ar); spf=pass (google.com: domain of linux-kernel+bounces-42866-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-42866-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 68A99B24783 for ; Mon, 29 Jan 2024 14:16:19 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 71873664C9; Mon, 29 Jan 2024 14:15:47 +0000 (UTC) Received: from alerce.blitiri.com.ar (alerce.blitiri.com.ar [49.12.208.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A815965BA3 for ; Mon, 29 Jan 2024 14:15:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=49.12.208.134 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706537745; cv=none; b=dWun18TdkVANlsQmrttlaZnfhqt8+C5ie9OcMSPUoi1slDF/3Pj4E0O2Pi5+MYNCFuoq5jzLwbrhSUArs4DGo4u8lY/CA97c/VRYIDFkSE78WwIiwnMOd8NOHNrRtJ/xKXjkGqmSpKppgkfPJ3Y/z2nH4TxApwnC8AvaNSQ3z2Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706537745; c=relaxed/simple; bh=yW/KTPvl1LdQSw2p4A5TjI0BdCEzeZVKTkHAyd72DpQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lmyex+tYlzMUwABkBdUm/+QEPSB9z8ZLp3WXLv/c9HIiulODjw6IjhsCs8Mg3ooo7blhzfibQZsuP5M22tyTH5lgM3uJ+Mw0aCAfLoe3mrqUTsMloYl1uNcW4ALTzQdZdYyd8df2vKGJswI9dx/8zOZZeL1/+u16DIM/xUeGQNQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sdfg.com.ar; spf=pass smtp.mailfrom=sdfg.com.ar; arc=none smtp.client-ip=49.12.208.134 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sdfg.com.ar Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sdfg.com.ar Received: from localhost.localdomain by sdfg.com.ar (chasquid) with ESMTPSA tls TLS_AES_128_GCM_SHA256 (over submission, TLS-1.3, envelope from "rodrigo@sdfg.com.ar") ; Mon, 29 Jan 2024 14:15:35 +0000 From: Rodrigo Campos To: Willy Tarreau , =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Cc: linux-kernel@vger.kernel.org, Rodrigo Campos Subject: [PATCH 1/4] tools/nolibc/string: export strlen() Date: Mon, 29 Jan 2024 15:15:13 +0100 Message-ID: <20240129141516.198636-2-rodrigo@sdfg.com.ar> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240129141516.198636-1-rodrigo@sdfg.com.ar> References: <20240129141516.198636-1-rodrigo@sdfg.com.ar> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789435173701914299 X-GMAIL-MSGID: 1789435173701914299 As with commit 8d304a374023, "tools/nolibc/string: export memset() and memmove()", gcc -Os without -ffreestanding may fail to compile with: cc -fno-asynchronous-unwind-tables -fno-ident -s -Os -nostdlib -lgcc -static -o test test.c /usr/bin/ld: /tmp/cccIasKL.o: in function `main': test.c:(.text.startup+0x1e): undefined reference to `strlen' collect2: error: ld returned 1 exit status As on the aforementioned commit, this patch adds a section to export this function so compilation works on those cases too. Signed-off-by: Rodrigo Campos --- tools/include/nolibc/string.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/include/nolibc/string.h b/tools/include/nolibc/string.h index a01c69dd495f..ed15c22b1b2a 100644 --- a/tools/include/nolibc/string.h +++ b/tools/include/nolibc/string.h @@ -123,7 +123,7 @@ char *strcpy(char *dst, const char *src) * thus itself, hence the asm() statement below that's meant to disable this * confusing practice. */ -static __attribute__((unused)) +__attribute__((weak,unused,section(".text.nolibc_strlen"))) size_t strlen(const char *str) { size_t len; From patchwork Mon Jan 29 14:15:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodrigo Campos X-Patchwork-Id: 193493 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2087:b0:106:209c:c626 with SMTP id gs7csp594016dyb; Mon, 29 Jan 2024 06:16:30 -0800 (PST) X-Google-Smtp-Source: AGHT+IH1Eq2r9z25uYhYIQn3KPDCG7lFGJFpWtXyBq22is4jbQjxEc81kbxziSmUDb1CBYNBQIzB X-Received: by 2002:a50:8a97:0:b0:55f:2078:32bd with SMTP id j23-20020a508a97000000b0055f207832bdmr715712edj.23.1706537790567; Mon, 29 Jan 2024 06:16:30 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706537790; cv=pass; d=google.com; s=arc-20160816; b=qHN+MWPGSp7v0U7pIEYmC806exSXqYbdal8pwckBZzdg2PDpYKs4zNjIfw7TRXtVsF OzmobRXxk5g/GaGgQgxV3bZAKyJmVLJxWCfF7QHLbLQ1HkhxGW8uKmcSqV9dZSFXSxMX yERe0W1I63uzG/gBuarvpc+2azGb+hLq+AOg++73rsgQ4T9FW4P0Up0sOelsw5l9MnpJ HwZndHSLADFLYJyXelVJAVcjj9teRMKXFkdGk3csTq2H0Z2eoHGZVud16SBB7Z/vOMYN ksKgkgXaFPF4BV2upIzKCpeDox/NU8jwz4+HMnVE5BgJctmOl+wNyltH3gZWigmWosRn L5aQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=5e/dGTJ7z+T+XCFJMU5fRg8FRn3HUWe9uaelPfJoLdM=; fh=1pO/fnqlbA1DlSshLp2Kp23nBXobkeZ558bQEuNU3Z8=; b=ZBNcncfhlCXAQm+KGFSRwRSL1R+qtc5w9Nlrp61INnpx77i6zO4yHfabVtFhfnPOBa P+n/9UPbzGf4jdElt5yw98xvXo7e4EE9JE1ZfJkS+CRrPRvucDHO78h3JE36fQ0FADsE KujKqiR+W2DTldwnA2+bgG+j1Jr1rmvq0nfZc4y1JTv80v+A07nLVNl6ZvTb2LLdrbDG fhv0jQkt2USxF0y8Ru+MFGI7DZOuyALp7OB+emVp6QezFnLvy75dGh15ysM4O/siKucd ZVOw4hSZ4hO2QX3eYLmW4Ij+kUNKRx/fsnDKWz/K72lmC7fSOpyLyKGqT6Ht/VV2bjON 8FnA== ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=sdfg.com.ar); spf=pass (google.com: domain of linux-kernel+bounces-42867-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-42867-ouuuleilei=gmail.com@vger.kernel.org" Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id c67-20020a509fc9000000b0055f2e703b53si9233edf.464.2024.01.29.06.16.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jan 2024 06:16:30 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-42867-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=sdfg.com.ar); spf=pass (google.com: domain of linux-kernel+bounces-42867-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-42867-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 2F74D1F216AF for ; Mon, 29 Jan 2024 14:16:30 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id BDBFF66B29; Mon, 29 Jan 2024 14:15:47 +0000 (UTC) Received: from alerce.blitiri.com.ar (alerce.blitiri.com.ar [49.12.208.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A820D65BA7 for ; Mon, 29 Jan 2024 14:15:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=49.12.208.134 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706537746; cv=none; b=pq5DRz2rjN3jJQbJIVtGb55oIK/k/qoNVQ4WCsJRja+DTT2rBe8SklvSa/ymrBrjBDE+TJORCUylPkna54BylaeJO+cW9n3KKr7ptjDyyuhlGOoPeVJWgBpCShBTQxmVYGisjEr5f5LSBw77Txkhgtz4mQQUaMBHIeSZPQ7wPu0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706537746; c=relaxed/simple; bh=t2kPYJ7pezKsYGsHLmpMN2up6sNljv6a0crp2CwK1j4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ny/Cha+7dUvuLSLt0ZY79w8O6gX9FQxl7vWdMKfpUH/aj0hxUxSqunVDnnq1s5JSbP7tG9nEVUjjmh4BOfy6d7xTu099Wv26Mqgh8MYksuFxH3/hW2VPR06leWWEjicw4wToeUmMtXC/s9KJiOqqLY2CdHjqFozXoJ35t+uwAO0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sdfg.com.ar; spf=pass smtp.mailfrom=sdfg.com.ar; arc=none smtp.client-ip=49.12.208.134 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sdfg.com.ar Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sdfg.com.ar Received: from localhost.localdomain by sdfg.com.ar (chasquid) with ESMTPSA tls TLS_AES_128_GCM_SHA256 (over submission, TLS-1.3, envelope from "rodrigo@sdfg.com.ar") ; Mon, 29 Jan 2024 14:15:35 +0000 From: Rodrigo Campos To: Willy Tarreau , =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Cc: linux-kernel@vger.kernel.org, Rodrigo Campos Subject: [PATCH 2/4] tools/nolibc: Fix strlcat() return code and size usage Date: Mon, 29 Jan 2024 15:15:14 +0100 Message-ID: <20240129141516.198636-3-rodrigo@sdfg.com.ar> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240129141516.198636-1-rodrigo@sdfg.com.ar> References: <20240129141516.198636-1-rodrigo@sdfg.com.ar> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789434570278994019 X-GMAIL-MSGID: 1789434570278994019 The return code should always be strlen(src) + strlen(dst), but dst is considered shorter if size is less than strlen(dst). While we are there, make sure to copy at most size-1 bytes and null-terminate the dst buffer. Signed-off-by: Rodrigo Campos --- tools/include/nolibc/string.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/include/nolibc/string.h b/tools/include/nolibc/string.h index ed15c22b1b2a..b2149e1342a8 100644 --- a/tools/include/nolibc/string.h +++ b/tools/include/nolibc/string.h @@ -187,23 +187,23 @@ char *strndup(const char *str, size_t maxlen) static __attribute__((unused)) size_t strlcat(char *dst, const char *src, size_t size) { - size_t len; char c; + size_t len = strlen(dst); + size_t ret = strlen(src) + (size < len? size: len); - for (len = 0; dst[len]; len++) - ; - - for (;;) { + for (;len < size;) { c = *src; - if (len < size) + if (len < size - 1) dst[len] = c; + if (len == size - 1) + dst[len] = '\0'; if (!c) break; len++; src++; } - return len; + return ret; } static __attribute__((unused)) From patchwork Mon Jan 29 14:15:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodrigo Campos X-Patchwork-Id: 193495 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2087:b0:106:209c:c626 with SMTP id gs7csp594288dyb; Mon, 29 Jan 2024 06:16:52 -0800 (PST) X-Google-Smtp-Source: AGHT+IEmGeWDhddoPrbxR4eT2cHME1SRKJFPowUBTBbBJ2CE8p31Fz1p+absyGZBW3W1r+9H/gt9 X-Received: by 2002:a05:6102:343:b0:46b:403c:e9b9 with SMTP id e3-20020a056102034300b0046b403ce9b9mr1091034vsa.3.1706537812415; Mon, 29 Jan 2024 06:16:52 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706537812; cv=pass; d=google.com; s=arc-20160816; b=y0+5Rx580v7rluYA/k1Jcvno2JbZYa2kSKhPZniRmFccris7iBl01GErSbKKo10mIR S841YpSp1rjC9HZN35JEBItz7JX+wkBwsfQzYpbHIXnsp28jd37d82zfNgp6suaHeIgt 48B0jiEwE7KTFHqbr+9nq/Ds5QXT1Z/R0skno2z6hDpzbSwC5pfdyQswXBS75YglfV9n l3XXwOOnTuXAweiV2GSDUEtK8tyM6KyWgzsYSd7VPKG3Y1u3ArP7lcn38FEHIlf1SGMl YY5qGHUL+spCk8tqQL2uRJBEDm/tTztrf8MeWlJ9rIX5oTs1CeXDfKw6o2n9P6bdHzwp Fg3A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=QFMdsPJoQ2X/PkrIym4NHWnjqdqIwU3qklc0sweEXf4=; fh=1pO/fnqlbA1DlSshLp2Kp23nBXobkeZ558bQEuNU3Z8=; b=PhT+N9uhAWT+v82vHSsTKg2YaXVRilC5dv4uzIqAulMN8GCSC0ze2gFriwE46JrOEE BNbGqKdLODAvSGr9gZ4tFGmVvtPn4G8CG6HLdC/hKWhtRYDx81mI4hFZoMTpQYsjJgZo WpLA3FOE0B4oh/YuEdwLu84pYqXOgx0MJJUA/3cTWW3AoGBl6sjNwBcOjaqArtGBV2n6 3M7W2+ByWEihahJEAZWOTzQmwFwAgYAmxZBylMAUl8t8O6cSu2xVTb7f54EQoqEOML+W E3K5VFJc4OwseahvKQ5kl8kTt9JRkJwP9dZbrR+erp8+keeisoVcpgeYx1csPFAKMOZP gejA== ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=sdfg.com.ar); spf=pass (google.com: domain of linux-kernel+bounces-42870-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-42870-ouuuleilei=gmail.com@vger.kernel.org" Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id ib12-20020a0561022b8c00b0046b2d6199fdsi810482vsb.660.2024.01.29.06.16.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jan 2024 06:16:52 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-42870-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=sdfg.com.ar); spf=pass (google.com: domain of linux-kernel+bounces-42870-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-42870-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 35BC31C22727 for ; Mon, 29 Jan 2024 14:16:52 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B7E1E67724; Mon, 29 Jan 2024 14:15:48 +0000 (UTC) Received: from alerce.blitiri.com.ar (alerce.blitiri.com.ar [49.12.208.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A819965BA4 for ; Mon, 29 Jan 2024 14:15:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=49.12.208.134 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706537747; cv=none; b=sP6oWoAtIgGVBQveYJuTRiIQq4y/l9d5M71CLVcBYtBiOJfNB8/B1EG93UAUUsxMtaCXTzhSueemVNvzFBbys4M3ZfSkUr4aotKDYd+/nBf2EIvY5OLz7U/e3vIXXHuEA7hvb7UbrMEdT4H+tnEyhNnzNIoHzNx5fWxulto5444= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706537747; c=relaxed/simple; bh=jJmfIz4w556Ptcd31JHp/E5FbsAW+xG8mxPMPAJNtj8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=u2/7FTuF6kEBELnYLRb+cmnwQY/vNEh2uMOqd4U+1QpYyAgSvaDZIodx+/zobhe+IZA9alRz9SFtBA6AoRkbIyF3Wstms/pPOpEqVsLus7PX7r3Wb6dpCcUqLo6zj3b5b9iu44/LdTdmqyHDFcr3cqFlr8ou2badJr+hKe6zUy0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sdfg.com.ar; spf=pass smtp.mailfrom=sdfg.com.ar; arc=none smtp.client-ip=49.12.208.134 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sdfg.com.ar Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sdfg.com.ar Received: from localhost.localdomain by sdfg.com.ar (chasquid) with ESMTPSA tls TLS_AES_128_GCM_SHA256 (over submission, TLS-1.3, envelope from "rodrigo@sdfg.com.ar") ; Mon, 29 Jan 2024 14:15:36 +0000 From: Rodrigo Campos To: Willy Tarreau , =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Cc: linux-kernel@vger.kernel.org, Rodrigo Campos Subject: [PATCH 3/4] tools/nolibc: Fix strlcpy() return code and size usage Date: Mon, 29 Jan 2024 15:15:15 +0100 Message-ID: <20240129141516.198636-4-rodrigo@sdfg.com.ar> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240129141516.198636-1-rodrigo@sdfg.com.ar> References: <20240129141516.198636-1-rodrigo@sdfg.com.ar> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789434592883579293 X-GMAIL-MSGID: 1789434592883579293 The return code should always be strlen(src), and we should copy at most size-1 bytes. While we are there, make sure to null-terminate the dst buffer. Signed-off-by: Rodrigo Campos --- tools/include/nolibc/string.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/include/nolibc/string.h b/tools/include/nolibc/string.h index b2149e1342a8..e4bc0302967d 100644 --- a/tools/include/nolibc/string.h +++ b/tools/include/nolibc/string.h @@ -212,15 +212,16 @@ size_t strlcpy(char *dst, const char *src, size_t size) size_t len; char c; - for (len = 0;;) { + for (len = 0; len < size; len++) { c = src[len]; - if (len < size) + if (len < size - 1) dst[len] = c; + if (len == size - 1) + dst[len] = '\0'; if (!c) break; - len++; } - return len; + return strlen(src); } static __attribute__((unused)) From patchwork Mon Jan 29 14:15:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodrigo Campos X-Patchwork-Id: 193494 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2087:b0:106:209c:c626 with SMTP id gs7csp594238dyb; Mon, 29 Jan 2024 06:16:48 -0800 (PST) X-Google-Smtp-Source: AGHT+IHQ4jNvqHsYjuIwgBPq8fZUHMqSnHKRv/IxGlGwECH0x4BByt76xYYYgSFTATbz1WHdfIgP X-Received: by 2002:aa7:c50d:0:b0:55f:2be4:61d with SMTP id o13-20020aa7c50d000000b0055f2be4061dmr189444edq.14.1706537808206; Mon, 29 Jan 2024 06:16:48 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706537808; cv=pass; d=google.com; s=arc-20160816; b=pEy64HLxMJBhSqF5OB/mNJs2tjCEnKIn53NheT9z6lE1Y/PA0c5SGbaBZItVl3/Hre FL0Ou9F7ZGfJd0/b0jIVBKdgTO97dm3pIhkGZJAQhoJ16IOFBNQOAVl04p6mvQTJ4702 d6l+qtfvKKSD11VPRbDestXgaW9mPTZKdTpw1LEVtd8FdoXD9TBXYHpLDB8DLOSBiGTI I7b5fXP4ybgF6vsVZ/BoysRL5C8StCdRjJmPlu2LufOqLu5tW1DpKFWwwOMtQaWQR6nb Oeeqdf67bCe8CPZsnIuPxoSeP4WBtbnlPLQ3l8mW7PaLriGYccMcPpwuVd3hxjLTfHG5 WcxQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=djcGsNWQHBCkLoAUAk/ZTgp6TwI/vNa3b2ZjUcrfSuw=; fh=1pO/fnqlbA1DlSshLp2Kp23nBXobkeZ558bQEuNU3Z8=; b=isDlKvpKZqgZXroneqRIY1UXK1yyX+1ZFqGufgVhC3kBOMtm/1UYzxl5d9oVrGH892 d3Xn2PYvSyH7QqVeDvSo67Vz6ysuwOIiuIBbx5jXsh1Bc9RL23xGAUYDo/zDajoXzqvD XZse9t1EBbDgcFZ9gNoj2D1XAVdEwNjgAuZGHZ5vc+MrYoPlLRRN7iPCmc15UIZVBIOv 1EgeqpPWOdp1Bfu6BflB6elVk2/BDyqxKiHdJ8H540YIFTp90R3dkgyHUUllXijKsyGh VFciVx0ejNzCjXHVmHb+IZ7SZAXQpMOfWy/lRvZEo6mMOiOs+hJxGqNIxNE0gz5JTTaj q/zg== ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=sdfg.com.ar); spf=pass (google.com: domain of linux-kernel+bounces-42869-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-42869-ouuuleilei=gmail.com@vger.kernel.org" Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id c15-20020a056402100f00b005588b351c5fsi3565235edu.409.2024.01.29.06.16.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jan 2024 06:16:48 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-42869-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=sdfg.com.ar); spf=pass (google.com: domain of linux-kernel+bounces-42869-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-42869-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id C76C91F23F3D for ; Mon, 29 Jan 2024 14:16:47 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 771FA66B55; Mon, 29 Jan 2024 14:15:48 +0000 (UTC) Received: from alerce.blitiri.com.ar (alerce.blitiri.com.ar [49.12.208.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A825165BA9 for ; Mon, 29 Jan 2024 14:15:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=49.12.208.134 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706537746; cv=none; b=cQ05S+2B6wcvtki4dIcNMmUu9XqLK75SEvhYKlZaJ5y7lxqqmBj1zRactS535MEMcAKExQLdhbBkWEvgiINqfDw5YSvGvC6hH5VWWkEr2ev9E45ToeWPKdl1w2+CML8+ai7vaGxzc6ydIlaV+/d42cfG8mA9N9diuNyafBbr058= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706537746; c=relaxed/simple; bh=Gn5XMisrKqtPzKloUCYqV2dG6OKnyY1SiteWokRK9/A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AWCcHve6UpmpAv58u5m67Qa7cRP8KAGhVdhfe/HEvj+qUKWxvSZ3VzkGpXRzogPgH79adSxBHgCYWdOC8NDKQyIGW0/OeSWulniNFxax+rdozHgQdWDPziupaBshRo1FzWPC9nWsl794EWr4F9LUoxpcPlT9r2CIomfdZ+NNmdo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sdfg.com.ar; spf=pass smtp.mailfrom=sdfg.com.ar; arc=none smtp.client-ip=49.12.208.134 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sdfg.com.ar Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sdfg.com.ar Received: from localhost.localdomain by sdfg.com.ar (chasquid) with ESMTPSA tls TLS_AES_128_GCM_SHA256 (over submission, TLS-1.3, envelope from "rodrigo@sdfg.com.ar") ; Mon, 29 Jan 2024 14:15:36 +0000 From: Rodrigo Campos To: Willy Tarreau , =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Cc: linux-kernel@vger.kernel.org, Rodrigo Campos Subject: [PATCH 4/4] selftests/nolibc: Add tests for strlcat() and strlcpy() Date: Mon, 29 Jan 2024 15:15:16 +0100 Message-ID: <20240129141516.198636-5-rodrigo@sdfg.com.ar> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240129141516.198636-1-rodrigo@sdfg.com.ar> References: <20240129141516.198636-1-rodrigo@sdfg.com.ar> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789434588763020904 X-GMAIL-MSGID: 1789434588763020904 I've verified that the tests matches libbsd's strlcat()/strlcpy() implementation. Please note that as strlcat()/strlcpy() are not part of the libc, the tests are only compiled when using nolibc. Signed-off-by: Rodrigo Campos --- tools/testing/selftests/nolibc/nolibc-test.c | 34 ++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/tools/testing/selftests/nolibc/nolibc-test.c b/tools/testing/selftests/nolibc/nolibc-test.c index 6ba4f8275ac4..aa365443bb2b 100644 --- a/tools/testing/selftests/nolibc/nolibc-test.c +++ b/tools/testing/selftests/nolibc/nolibc-test.c @@ -600,6 +600,25 @@ int expect_strne(const char *expr, int llen, const char *cmp) return ret; } +#define EXPECT_STRBUFEQ(cond, expr, buf, val, cmp) \ + do { if (!(cond)) result(llen, SKIPPED); else ret += expect_str_buf_eq(expr, buf, val, llen, cmp); } while (0) + +static __attribute__((unused)) +int expect_str_buf_eq(size_t expr, const char *buf, size_t val, int llen, const char *cmp) +{ + llen += printf(" = %lu <%s> ", expr, buf); + if (strcmp(buf, cmp) != 0) { + result(llen, FAIL); + return 1; + } + if (expr != val) { + result(llen, FAIL); + return 1; + } + + result(llen, OK); + return 0; +} /* declare tests based on line numbers. There must be exactly one test per line. */ #define CASE_TEST(name) \ @@ -991,6 +1010,9 @@ int run_stdlib(int min, int max) for (test = min; test >= 0 && test <= max; test++) { int llen = 0; /* line length */ + /* For functions that take a long buffer, like strlcat() */ + char buf[7] = "foo"; + /* avoid leaving empty lines below, this will insert holes into * test numbers. */ @@ -1007,6 +1029,18 @@ int run_stdlib(int min, int max) CASE_TEST(strchr_foobar_z); EXPECT_STRZR(1, strchr("foobar", 'z')); break; CASE_TEST(strrchr_foobar_o); EXPECT_STREQ(1, strrchr("foobar", 'o'), "obar"); break; CASE_TEST(strrchr_foobar_z); EXPECT_STRZR(1, strrchr("foobar", 'z')); break; +#ifdef NOLIBC + CASE_TEST(strlcat_0); EXPECT_STRBUFEQ(1, strlcat(buf, "bar", 0), buf, 3, "foo"); break; + CASE_TEST(strlcat_1); EXPECT_STRBUFEQ(1, strlcat(buf, "bar", 1), buf, 4, "foo"); break; + CASE_TEST(strlcat_3); EXPECT_STRBUFEQ(1, strlcat(buf, "bar", 3), buf, 6, "foo"); break; + CASE_TEST(strlcat_5); EXPECT_STRBUFEQ(1, strlcat(buf, "bar", 5), buf, 6, "foob"); break; + CASE_TEST(strlcat_7); EXPECT_STRBUFEQ(1, strlcat(buf, "bar", 7), buf, 6, "foobar"); break; + CASE_TEST(strlcpy_0); EXPECT_STRBUFEQ(1, strlcpy(buf, "bar", 0), buf, 3, "foo"); break; + CASE_TEST(strlcpy_1); EXPECT_STRBUFEQ(1, strlcpy(buf, "bar", 1), buf, 3, ""); break; + CASE_TEST(strlcpy_2); EXPECT_STRBUFEQ(1, strlcpy(buf, "bar", 2), buf, 3, "b"); break; + CASE_TEST(strlcpy_3); EXPECT_STRBUFEQ(1, strlcpy(buf, "bar", 3), buf, 3, "ba"); break; + CASE_TEST(strlcpy_4); EXPECT_STRBUFEQ(1, strlcpy(buf, "bar", 4), buf, 3, "bar"); break; +#endif CASE_TEST(memcmp_20_20); EXPECT_EQ(1, memcmp("aaa\x20", "aaa\x20", 4), 0); break; CASE_TEST(memcmp_20_60); EXPECT_LT(1, memcmp("aaa\x20", "aaa\x60", 4), 0); break; CASE_TEST(memcmp_60_20); EXPECT_GT(1, memcmp("aaa\x60", "aaa\x20", 4), 0); break;