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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 786EDC5DF60 for ; Fri, 8 Nov 2019 19:03:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 410B620650 for ; Fri, 8 Nov 2019 19:03:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573239832; bh=qHrXqXTGoipl8/RNConQPJh/ZF8X6C0g1hIwEtiH0vM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=g0YPMnqoEbGm/E147jkArTjuyTHwZ0yLruadjmHXAqp9GS1e/RS7olhJCgUb9SrTl NOHnPhyXHgWIbQR3hgGSZ+O7gRx02kij9Cje6cI7tb50y39FG5NcJnJ83hsAKsmRa8 yMDZJBm+dQp/A/GaDHcsZzmXl4lXFzzVXJ2Lrf3w= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387615AbfKHTDq (ORCPT ); Fri, 8 Nov 2019 14:03:46 -0500 Received: from mail.kernel.org ([198.145.29.99]:33544 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732439AbfKHTDp (ORCPT ); Fri, 8 Nov 2019 14:03:45 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DAE9F2087E; Fri, 8 Nov 2019 19:03:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573239825; bh=qHrXqXTGoipl8/RNConQPJh/ZF8X6C0g1hIwEtiH0vM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mvipFJvwnEL/+soM8x1t7HSRQSPmU0Op0eLbNAA3vQLJIrSokJ2HKpjg7REM1XMR6 Lo7/r2J56BwdkxEA5JLCsu1052/B8plkhKWPKzCMZt0V0a3PmRik3tfH7kuAVgbV2G XASRWPd5RmdpW3ngO4psfnHlpgvqoT9XZBjnV2+Q= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Maxim Mikityanskiy , Johannes Berg , Sasha Levin Subject: [PATCH 4.19 72/79] wireless: Skip directory when generating certificates Date: Fri, 8 Nov 2019 19:50:52 +0100 Message-Id: <20191108174824.968628501@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191108174745.495640141@linuxfoundation.org> References: <20191108174745.495640141@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Maxim Mikityanskiy [ Upstream commit 32b5a2c9950b9284000059d752f7afa164deb15e ] Commit 715a12334764 ("wireless: don't write C files on failures") drops the `test -f $$f` check. The list of targets contains the CONFIG_CFG80211_EXTRA_REGDB_KEYDIR directory itself, and this check used to filter it out. After the check was removed, the extra keydir option no longer works, failing with the following message: od: 'standard input': read error: Is a directory This commit restores the check to make extra keydir work again. Fixes: 715a12334764 ("wireless: don't write C files on failures") Signed-off-by: Maxim Mikityanskiy Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/wireless/Makefile | 1 + 1 file changed, 1 insertion(+) --- a/net/wireless/Makefile +++ b/net/wireless/Makefile @@ -38,6 +38,7 @@ $(obj)/extra-certs.c: $(CONFIG_CFG80211_ @(set -e; \ allf=""; \ for f in $^ ; do \ + test -f $$f || continue;\ # similar to hexdump -v -e '1/1 "0x%.2x," "\n"' \ thisf=$$(od -An -v -tx1 < $$f | \ sed -e 's/ /\n/g' | \