Received: by 10.213.65.68 with SMTP id h4csp464621imn; Tue, 13 Mar 2018 09:54:06 -0700 (PDT) X-Google-Smtp-Source: AG47ELtZQWapEc7jKMektIQe3lgo4KuhpmqVZyRuFrGu7gp794wsiUZJLmE0HYuL0znCEnO7qaja X-Received: by 10.99.101.193 with SMTP id z184mr1032217pgb.429.1520960045992; Tue, 13 Mar 2018 09:54:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1520960045; cv=none; d=google.com; s=arc-20160816; b=bnU0Faxext9JaBTvI++xQ82PkSJeQTgGYOZ7Ho+24YQYKvspPLrRodUj/lFWtrF07y get17yvU9XPEmBS0sHW1wJ2WDWiCaOPZuTj9kVSB6j3GbtTSmkac5oYpDyiW1P7tfVp9 Z9NhSaflZofN0dLyq4yFeHWjgvfbBfOhGmguB88jjCFoSYE3FONY89MzMNgAQ5ahzi76 qCEd/aA9F0lruIB9wj7+zZ+2FxAekyi3aifFrVMKXUVkOlEnlb4QUrRJPmIr+S4aMHcw Z4jGdlz6AR+XKNTaHeRqxGqImiCAzdMuUoAKj8t/Jslm+bskCIygEJi+wSucbcNzwt93 Amqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:date:message-id:user-agent:cc:to :references:in-reply-to:from:subject:content-transfer-encoding :mime-version:dmarc-filter:dkim-signature:dkim-signature :arc-authentication-results; bh=TjJordkG1w7r1AZKXEtHU99qe/zUXVimWew3VAbjdbE=; b=NGPBlDSiLQYTvAG9HAi8TAEdCfni20udntapkq+8mO7uP+Octrq+mPn6iXLHQ865Tl aq3y/MjRHwgvWKeCOKvNOcueoFtvXR2Nn98rEUfGuL0f/TzEARQveFu36sBrr+xcAy2W M5TPG+77ikdZpE8ZJiI0MyPwMoP/kJuGX8LiSXnCMaNN27YROyD/HHxMgJ67huzB/Azn iRdyK6WfPZm5QuizkPfQZ0gq1HFc4DEE/l6bQgoVzhE92gSd/gMWLaaccosLA/KIAzGi 2DUJdr9N3II+kPtuqrCPcCLf+PPraaj1zxjzuaEC1/TjSU5AMFoFJokdBwTJWRjwelGl i4DA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b=CrBAwGAi; dkim=pass header.i=@codeaurora.org header.s=default header.b=VpxhhpgP; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f10-v6si294334plm.188.2018.03.13.09.53.52; Tue, 13 Mar 2018 09:54:05 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b=CrBAwGAi; dkim=pass header.i=@codeaurora.org header.s=default header.b=VpxhhpgP; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933281AbeCMQwM (ORCPT + 99 others); Tue, 13 Mar 2018 12:52:12 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:57434 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751936AbeCMQwI (ORCPT ); Tue, 13 Mar 2018 12:52:08 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 07EFA60A24; Tue, 13 Mar 2018 16:52:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1520959928; bh=mnNrUU0GSqfsI3luZCXi5N9H/vr8zPwrM5i+CfhpKIo=; h=Subject:From:In-Reply-To:References:To:Cc:Date:From; b=CrBAwGAivJA4U0ATAJva6BhE9STgCOHmD3fI/4m9Sz8t67CTeDS3uVq5129xyp/MD VRqSxarV+EoRdCPiTWFN/rywKi2WeH6UeUh679LY8ptQoVu1/ZkoVUT+ISg7aRmA+E wV9jaN8hNd/iWnR/e0jpithINey5t1lCIbaPb5hI= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.9 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,MISSING_DATE,MISSING_MID,T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.0 Received: from potku.adurom.net (88-114-240-52.elisa-laajakaista.fi [88.114.240.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: kvalo@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 6929E60853; Tue, 13 Mar 2018 16:52:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1520959927; bh=mnNrUU0GSqfsI3luZCXi5N9H/vr8zPwrM5i+CfhpKIo=; h=Subject:From:In-Reply-To:References:To:Cc:From; b=VpxhhpgPZM5d+hIJqDMBnVG0NC4xM0XCAOE4CBp4n527DecItByuZNR3SwsHj5WRq m0paHKFZCa1AYEXA2HrEkkg7EO1oEM9Otqx4CO1VjzY6xfbG/diET7l67gvD5SZT3C mfoZIoS95lSXM0MLHHbb2wemT4AQAFnuC3LfFTMU= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 6929E60853 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=kvalo@codeaurora.org Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: Re: [RESEND] rsi: Remove stack VLA usage From: Kalle Valo In-Reply-To: <1520819022-15238-1-git-send-email-me@tobin.cc> References: <1520819022-15238-1-git-send-email-me@tobin.cc> To: "Tobin C. Harding" Cc: "Tobin C. Harding" , kernel-hardening@lists.openwall.com, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-wireless@vger.kernel.org, Tycho Andersen , Kees Cook User-Agent: pwcli/0.0.0-git (https://github.com/kvalo/pwcli/) Python/2.7.12 Message-Id: <20180313165208.07EFA60A24@smtp.codeaurora.org> Date: Tue, 13 Mar 2018 16:52:07 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org "Tobin C. Harding" wrote: > The kernel would like to have all stack VLA usage removed[1]. rsi uses > a VLA based on 'blksize'. Elsewhere in the SDIO code maximum block size > is defined using a magic number. We can use a pre-processor defined > constant and declare the array to maximum size. We add a check before > accessing the array in case of programmer error. > > [1]: https://lkml.org/lkml/2018/3/7/621 > > Signed-off-by: Tobin C. Harding There were conflicts. Can you rebase on top of wireless-drivers-next and resend, please? Recorded preimage for 'drivers/net/wireless/rsi/rsi_91x_sdio.c' error: Failed to merge in the changes. Applying: rsi: Remove stack VLA usage Using index info to reconstruct a base tree... M drivers/net/wireless/rsi/rsi_91x_hal.c M drivers/net/wireless/rsi/rsi_91x_sdio.c Falling back to patching base and 3-way merge... Auto-merging drivers/net/wireless/rsi/rsi_91x_sdio.c CONFLICT (content): Merge conflict in drivers/net/wireless/rsi/rsi_91x_sdio.c Auto-merging drivers/net/wireless/rsi/rsi_91x_hal.c Patch failed at 0001 rsi: Remove stack VLA usage The copy of the patch that failed is found in: .git/rebase-apply/patch Patch set to Changes Requested. -- https://patchwork.kernel.org/patch/10274983/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches