From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-23.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7583AC4320E for ; Wed, 25 Aug 2021 22:02:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5351F610A4 for ; Wed, 25 Aug 2021 22:02:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233757AbhHYWC4 (ORCPT ); Wed, 25 Aug 2021 18:02:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60954 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229707AbhHYWCy (ORCPT ); Wed, 25 Aug 2021 18:02:54 -0400 Received: from mail-lf1-x12a.google.com (mail-lf1-x12a.google.com [IPv6:2a00:1450:4864:20::12a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4F8A4C061757 for ; Wed, 25 Aug 2021 15:02:08 -0700 (PDT) Received: by mail-lf1-x12a.google.com with SMTP id y34so1978125lfa.8 for ; Wed, 25 Aug 2021 15:02:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=Ap07zgvRCzHUWZsKzTqV0nv5eVeNrhiykOkW+2Q+N8I=; b=V0RfDdAyEknz5KXI21deyJWGKBtldhdU7eYU32v3+FYtF8NzVK6ypPcrEQF8iGVh9+ R31/nL49iM2YuRMj6y07FYcnclwCqu87K4SCTWIdrCiyF816igVvCdfHYrfhyJ+UMKZJ YrIH5Sd3c7JRcix5m4U4SC4LSMyIbi24SUN22kt6fPeCw9xxYZe1jh0C2Aqi/HH0Tq5l K+1tLSG8Uzo4O2xuhUFeKcfFkgWa8dmjcF24ogJxzOUGVIddLld72otsgtWnMrEgJajR KrTIFh/vHsTkdSwzHCZwABYf8Li+J/BY75/krxwgZCKkUKe9uSRWfpqG3hKooSdUFzhU WbaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Ap07zgvRCzHUWZsKzTqV0nv5eVeNrhiykOkW+2Q+N8I=; b=P9tgIt8gptqz5Oue1ETh/KwPqm7QQ2T53Fcp9Md+GnsAS5QZ9q8y86d3JddCSOt3if m7bCozp+9aTwAjJWq1rCl8fmT9m9gbjSOUBb23xetdwjK9u9ecPFjLoqoHnZ6ruH1ljV VVw9bhAY+PSvcRTAL1KB1pXQ1nnkduWncOtpFnQN+uoH+T/vPoiaNHTevXbQcBlayESU k6BcyM8aKoP59z/LIHax6Eg1zzHWWcn9MsUdrgz5nYoq/759xDTbIJ3uJbc9lea/0/Cf 54ZShfbeIBsFk1JL0DhHjp5wpNDF2NZ9Roy/wcuq1WzE9DXRQ7MPhNwwh+AC7X/ZDU9y IUVw== X-Gm-Message-State: AOAM532n6nREhwn1vrjHfrnb1nQg+MeGj+IidSYthpJ+N0jEGZLGUEOy 2UJ9fvQpJ2VCFH/7SOQaS0RbQxgOxMV2U38yt3tVv5OlA+mv6Q== X-Google-Smtp-Source: ABdhPJww2+7yBE9cppy9XJx9RGtuG2b3Nw6jhEEVvCLdZyZzODN88Y5xBICzIm0DAaG/K8nuxqq2bli3ZyrX9IeaqDE= X-Received: by 2002:a19:f017:: with SMTP id p23mr190205lfc.547.1629928926500; Wed, 25 Aug 2021 15:02:06 -0700 (PDT) MIME-Version: 1.0 References: <20210822075122.864511-1-keescook@chromium.org> <20210822075122.864511-19-keescook@chromium.org> In-Reply-To: <20210822075122.864511-19-keescook@chromium.org> From: Nick Desaulniers Date: Wed, 25 Aug 2021 15:01:54 -0700 Message-ID: Subject: Re: [PATCH for-next 18/25] fortify: Prepare to improve strnlen() and strlen() warnings To: Kees Cook Cc: linux-kernel@vger.kernel.org, Francis Laniel , Rasmus Villemoes , Daniel Micay , Bart Van Assche , David Gow , linux-mm@kvack.org, clang-built-linux@googlegroups.com, linux-hardening@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, Aug 22, 2021 at 12:57 AM Kees Cook wrote: > > In order to have strlen() use fortified strnlen() internally, swap their > positions in the source. Doing this as part of later changes makes > review difficult, so reoroder it here; no code changes. > > Cc: Francis Laniel > Signed-off-by: Kees Cook Reviewed-by: Nick Desaulniers > --- > include/linux/fortify-string.h | 22 +++++++++++----------- > 1 file changed, 11 insertions(+), 11 deletions(-) > > diff --git a/include/linux/fortify-string.h b/include/linux/fortify-string.h > index 68bc5978d916..a3cb1d9aacce 100644 > --- a/include/linux/fortify-string.h > +++ b/include/linux/fortify-string.h > @@ -56,6 +56,17 @@ __FORTIFY_INLINE char *strcat(char *p, const char *q) > return p; > } > > +extern __kernel_size_t __real_strnlen(const char *, __kernel_size_t) __RENAME(strnlen); > +__FORTIFY_INLINE __kernel_size_t strnlen(const char *p, __kernel_size_t maxlen) > +{ > + size_t p_size = __builtin_object_size(p, 1); > + __kernel_size_t ret = __real_strnlen(p, maxlen < p_size ? maxlen : p_size); > + > + if (p_size <= ret && maxlen != ret) > + fortify_panic(__func__); > + return ret; > +} > + > __FORTIFY_INLINE __kernel_size_t strlen(const char *p) > { > __kernel_size_t ret; > @@ -71,17 +82,6 @@ __FORTIFY_INLINE __kernel_size_t strlen(const char *p) > return ret; > } > > -extern __kernel_size_t __real_strnlen(const char *, __kernel_size_t) __RENAME(strnlen); > -__FORTIFY_INLINE __kernel_size_t strnlen(const char *p, __kernel_size_t maxlen) > -{ > - size_t p_size = __builtin_object_size(p, 1); > - __kernel_size_t ret = __real_strnlen(p, maxlen < p_size ? maxlen : p_size); > - > - if (p_size <= ret && maxlen != ret) > - fortify_panic(__func__); > - return ret; > -} > - > /* defined after fortified strlen to reuse it */ > extern size_t __real_strlcpy(char *, const char *, size_t) __RENAME(strlcpy); > __FORTIFY_INLINE size_t strlcpy(char *p, const char *q, size_t size) > -- > 2.30.2 > > -- > You received this message because you are subscribed to the Google Groups "Clang Built Linux" group. > To unsubscribe from this group and stop receiving emails from it, send an email to clang-built-linux+unsubscribe@googlegroups.com. > To view this discussion on the web visit https://groups.google.com/d/msgid/clang-built-linux/20210822075122.864511-19-keescook%40chromium.org. -- Thanks, ~Nick Desaulniers From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-23.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D22AEC432BE for ; Wed, 25 Aug 2021 22:02:09 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 6FE0B61056 for ; Wed, 25 Aug 2021 22:02:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 6FE0B61056 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id E85CC8D0001; Wed, 25 Aug 2021 18:02:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E36316B0072; Wed, 25 Aug 2021 18:02:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D24688D0001; Wed, 25 Aug 2021 18:02:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0097.hostedemail.com [216.40.44.97]) by kanga.kvack.org (Postfix) with ESMTP id B6DE26B006C for ; Wed, 25 Aug 2021 18:02:08 -0400 (EDT) Received: from smtpin34.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 5F4A0824999B for ; Wed, 25 Aug 2021 22:02:08 +0000 (UTC) X-FDA: 78514976736.34.B77DA52 Received: from mail-lf1-f49.google.com (mail-lf1-f49.google.com [209.85.167.49]) by imf23.hostedemail.com (Postfix) with ESMTP id 134E490000A7 for ; Wed, 25 Aug 2021 22:02:07 +0000 (UTC) Received: by mail-lf1-f49.google.com with SMTP id b4so1921099lfo.13 for ; Wed, 25 Aug 2021 15:02:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=Ap07zgvRCzHUWZsKzTqV0nv5eVeNrhiykOkW+2Q+N8I=; b=V0RfDdAyEknz5KXI21deyJWGKBtldhdU7eYU32v3+FYtF8NzVK6ypPcrEQF8iGVh9+ R31/nL49iM2YuRMj6y07FYcnclwCqu87K4SCTWIdrCiyF816igVvCdfHYrfhyJ+UMKZJ YrIH5Sd3c7JRcix5m4U4SC4LSMyIbi24SUN22kt6fPeCw9xxYZe1jh0C2Aqi/HH0Tq5l K+1tLSG8Uzo4O2xuhUFeKcfFkgWa8dmjcF24ogJxzOUGVIddLld72otsgtWnMrEgJajR KrTIFh/vHsTkdSwzHCZwABYf8Li+J/BY75/krxwgZCKkUKe9uSRWfpqG3hKooSdUFzhU WbaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Ap07zgvRCzHUWZsKzTqV0nv5eVeNrhiykOkW+2Q+N8I=; b=MTnH30U3PHtNLobjz20CiR0ODjuQKhjZZn8zHiwrAza91wCj9ktrP3MDzrziz65QtB XQtzzfVRalqhMd1oQKDzldj2JcWYAnJ8gj8k2N1czK8NUt65yYdUdryErAMPeP8x3e6e DY10xTLQTOmpnkPAXirCHj6VNLZk2pfpOHEAYuuXQBW0Bw+X7WzMN1xKrAZ/cYIbyont bG65WarxXn4ucqXYuFAyHk5zV1DBsnDcNWibnZHvaA/eljGNF6J/ep52wM2Y7trUYvAO UmSf/HyBf50bsd104Blz6kFJct44qpG2zK4a1POJymtmYIN6qX2EGusWatBtMWK0LWCi D98Q== X-Gm-Message-State: AOAM532SF3todtzc/KwqjDrKn0OTwloVe933qIopxaoczI+1r+ug2HAd GD4rS1Bs56qTy1b2hPxqARPgNtnzT9RXvnW/MF7Htg== X-Google-Smtp-Source: ABdhPJww2+7yBE9cppy9XJx9RGtuG2b3Nw6jhEEVvCLdZyZzODN88Y5xBICzIm0DAaG/K8nuxqq2bli3ZyrX9IeaqDE= X-Received: by 2002:a19:f017:: with SMTP id p23mr190205lfc.547.1629928926500; Wed, 25 Aug 2021 15:02:06 -0700 (PDT) MIME-Version: 1.0 References: <20210822075122.864511-1-keescook@chromium.org> <20210822075122.864511-19-keescook@chromium.org> In-Reply-To: <20210822075122.864511-19-keescook@chromium.org> From: Nick Desaulniers Date: Wed, 25 Aug 2021 15:01:54 -0700 Message-ID: Subject: Re: [PATCH for-next 18/25] fortify: Prepare to improve strnlen() and strlen() warnings To: Kees Cook Cc: linux-kernel@vger.kernel.org, Francis Laniel , Rasmus Villemoes , Daniel Micay , Bart Van Assche , David Gow , linux-mm@kvack.org, clang-built-linux@googlegroups.com, linux-hardening@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=google.com header.s=20161025 header.b=V0RfDdAy; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf23.hostedemail.com: domain of ndesaulniers@google.com designates 209.85.167.49 as permitted sender) smtp.mailfrom=ndesaulniers@google.com X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 134E490000A7 X-Stat-Signature: za5npxgawfrhswapag8ozzpqkxi33a4i X-HE-Tag: 1629928927-899316 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Sun, Aug 22, 2021 at 12:57 AM Kees Cook wrote: > > In order to have strlen() use fortified strnlen() internally, swap their > positions in the source. Doing this as part of later changes makes > review difficult, so reoroder it here; no code changes. > > Cc: Francis Laniel > Signed-off-by: Kees Cook Reviewed-by: Nick Desaulniers > --- > include/linux/fortify-string.h | 22 +++++++++++----------- > 1 file changed, 11 insertions(+), 11 deletions(-) > > diff --git a/include/linux/fortify-string.h b/include/linux/fortify-string.h > index 68bc5978d916..a3cb1d9aacce 100644 > --- a/include/linux/fortify-string.h > +++ b/include/linux/fortify-string.h > @@ -56,6 +56,17 @@ __FORTIFY_INLINE char *strcat(char *p, const char *q) > return p; > } > > +extern __kernel_size_t __real_strnlen(const char *, __kernel_size_t) __RENAME(strnlen); > +__FORTIFY_INLINE __kernel_size_t strnlen(const char *p, __kernel_size_t maxlen) > +{ > + size_t p_size = __builtin_object_size(p, 1); > + __kernel_size_t ret = __real_strnlen(p, maxlen < p_size ? maxlen : p_size); > + > + if (p_size <= ret && maxlen != ret) > + fortify_panic(__func__); > + return ret; > +} > + > __FORTIFY_INLINE __kernel_size_t strlen(const char *p) > { > __kernel_size_t ret; > @@ -71,17 +82,6 @@ __FORTIFY_INLINE __kernel_size_t strlen(const char *p) > return ret; > } > > -extern __kernel_size_t __real_strnlen(const char *, __kernel_size_t) __RENAME(strnlen); > -__FORTIFY_INLINE __kernel_size_t strnlen(const char *p, __kernel_size_t maxlen) > -{ > - size_t p_size = __builtin_object_size(p, 1); > - __kernel_size_t ret = __real_strnlen(p, maxlen < p_size ? maxlen : p_size); > - > - if (p_size <= ret && maxlen != ret) > - fortify_panic(__func__); > - return ret; > -} > - > /* defined after fortified strlen to reuse it */ > extern size_t __real_strlcpy(char *, const char *, size_t) __RENAME(strlcpy); > __FORTIFY_INLINE size_t strlcpy(char *p, const char *q, size_t size) > -- > 2.30.2 > > -- > You received this message because you are subscribed to the Google Groups "Clang Built Linux" group. > To unsubscribe from this group and stop receiving emails from it, send an email to clang-built-linux+unsubscribe@googlegroups.com. > To view this discussion on the web visit https://groups.google.com/d/msgid/clang-built-linux/20210822075122.864511-19-keescook%40chromium.org. -- Thanks, ~Nick Desaulniers