Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <23b905f8-2836-8879-fe9f-9521e0f8674e@linux.ibm.com>
Date:   Tue, 27 Sep 2022 13:54:27 +0200
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:91.0)
 Gecko/20100101 Thunderbird/91.13.1
Subject: Re: [PATCH] s390/qeth: Split memcpy() of struct
 qeth_ipacmd_addr_change flexible array
Content-Language: en-US
To:     "Gustavo A. R. Silva" <gustavoars@kernel.org>,
        Kees Cook <keescook@chromium.org>
Cc:     Wenjia Zhang <wenjia@linux.ibm.com>,
        Heiko Carstens <hca@linux.ibm.com>,
        Vasily Gorbik <gor@linux.ibm.com>,
        Alexander Gordeev <agordeev@linux.ibm.com>,
        Christian Borntraeger <borntraeger@linux.ibm.com>,
        Sven Schnelle <svens@linux.ibm.com>,
        linux-s390@vger.kernel.org, netdev@vger.kernel.org,
        linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org
References: <20220927003953.1942442-1-keescook@chromium.org>
 <YzJO0f7v7N4Z+9Dk@work>
From:   Alexandra Winter <wintera@linux.ibm.com>
In-Reply-To: <YzJO0f7v7N4Z+9Dk@work>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
Precedence: bulk


On 27.09.22 03:16, Gustavo A. R. Silva wrote:
> On Mon, Sep 26, 2022 at 05:39:53PM -0700, Kees Cook wrote:
>> To work around a misbehavior of the compiler's ability to see into
>> composite flexible array structs (as detailed in the coming memcpy()
>> hardening series[1]), split the memcpy() of the header and the payload
>> so no false positive run-time overflow warning will be generated.
>>
>> [1] https://lore.kernel.org/linux-hardening/20220901065914.1417829-2-keescook@chromium.org/
>>
>> Cc: Alexandra Winter <wintera@linux.ibm.com>
>> Cc: Wenjia Zhang <wenjia@linux.ibm.com>
>> Cc: Heiko Carstens <hca@linux.ibm.com>
>> Cc: Vasily Gorbik <gor@linux.ibm.com>
>> Cc: Alexander Gordeev <agordeev@linux.ibm.com>
>> Cc: Christian Borntraeger <borntraeger@linux.ibm.com>
>> Cc: Sven Schnelle <svens@linux.ibm.com>
>> Cc: linux-s390@vger.kernel.org
>> Cc: netdev@vger.kernel.org
>> Signed-off-by: Kees Cook <keescook@chromium.org>
> 
> Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
> 
> Thanks!
> --
> Gustavo
> 
Reviewed-by: Alexandra Winter <wintera@linux.ibm.com>

Thank you
Alexandra
>> ---
>>  drivers/s390/net/qeth_l2_main.c | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
>> index 2d4436cbcb47..0ce635b7b472 100644
>> --- a/drivers/s390/net/qeth_l2_main.c
>> +++ b/drivers/s390/net/qeth_l2_main.c
>> @@ -1530,8 +1530,8 @@ static void qeth_addr_change_event(struct qeth_card *card,
>>  	else
>>  		INIT_DELAYED_WORK(&data->dwork, qeth_l2_dev2br_worker);
>>  	data->card = card;
>> -	memcpy(&data->ac_event, hostevs,
>> -			sizeof(struct qeth_ipacmd_addr_change) + extrasize);
>> +	data->ac_event = *hostevs;
>> +	memcpy(data->ac_event.entry, hostevs->entry, extrasize);
>>  	queue_delayed_work(card->event_wq, &data->dwork, 0);
>>  }
>>  
>> -- 
>> 2.34.1
>>