From patchwork Mon Jan 4 23:06:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 11997735 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=-18.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, INCLUDES_PULL_REQUEST,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE, SPF_PASS 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 7A99AC433E0 for ; Mon, 4 Jan 2021 23:08:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 49553207BC for ; Mon, 4 Jan 2021 23:08:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727235AbhADXIA (ORCPT ); Mon, 4 Jan 2021 18:08:00 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:29132 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727117AbhADXIA (ORCPT ); Mon, 4 Jan 2021 18:08:00 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1609801594; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yVDxwdUBGkQMs4znx48SVYeyk3m6+wNqj8IWaOnvkQE=; b=P9PaqAkirKRww/qXP8ZKqcGmy1OEFszUoI0Rx5sY6ly02SWYDCoEnoEOvWNd4NnxiIXQ2Q qryejQXMiOAnj1zAeUB/yegLNklpqyJstJJ47NJi6mBLwi1E3kWeZWmkFokjNFaE0Sez3Z NQxQJATq9T2vfPQFr6SoRCwaJ5IsrPw= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-539-TZyJnsy5OT61xslAofjc3w-1; Mon, 04 Jan 2021 18:06:32 -0500 X-MC-Unique: TZyJnsy5OT61xslAofjc3w-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8C8B3107ACE3; Mon, 4 Jan 2021 23:06:30 +0000 (UTC) Received: from warthog.procyon.org.uk (ovpn-112-8.rdu2.redhat.com [10.10.112.8]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3615B60BE5; Mon, 4 Jan 2021 23:06:29 +0000 (UTC) Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 From: David Howells To: To:; Cc: dhowells@redhat.com, Marc Dionne , linux-afs@lists.infradead.org, linux-fsdevel , Linux Kernel Mailing List Subject: [GIT PULL] afs: Fix directory entry name handling MIME-Version: 1.0 Content-ID: <311221.1609801588.1@warthog.procyon.org.uk> Date: Mon, 04 Jan 2021 23:06:28 +0000 Message-ID: <311222.1609801588@warthog.procyon.org.uk> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org Hi Linus, Could you pull these two commits, assuming Daniel doesn't object? The first is the fix for the strnlen() array limit check and the second fixes the calculation of the number of dirent records used to represent any particular filename length. I've added Tested-bys for Marc Dionne into the branch, but otherwise the patches should be the same as have been on the branch since the 23rd (was commit 587f19fc90c1). David --- The following changes since commit a409ed156a90093a03fe6a93721ddf4c591eac87: Merge tag 'gpio-v5.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio (2020-12-17 18:07:20 -0800) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git tags/afs-fixes-04012021 for you to fetch changes up to 366911cd762db02c2dd32fad1be96b72a66f205d: afs: Fix directory entry size calculation (2021-01-04 12:25:19 +0000) ---------------------------------------------------------------- AFS fixes ---------------------------------------------------------------- David Howells (2): afs: Work around strnlen() oops with CONFIG_FORTIFIED_SOURCE=y afs: Fix directory entry size calculation fs/afs/dir.c | 49 ++++++++++++++++++++++++---------------------- fs/afs/dir_edit.c | 6 ++---- fs/afs/xdr_fs.h | 25 +++++++++++++++++++---- include/trace/events/afs.h | 2 ++ 4 files changed, 51 insertions(+), 31 deletions(-)