[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <e296bd4a-2f52-390b-c3a0-b73e4449f097@linaro.org>
Date: Sat, 2 Apr 2022 11:05:50 +0200
From: Krzysztof Kozlowski <krzysztof.kozlowski@...aro.org>
To: Martin Faltesek <mfaltesek@...omium.org>, netdev@...r.kernel.org,
kuba@...nel.org, christophe.ricard@...il.com, jordy@...ing.systems
Cc: sameo@...ux.intel.com, wklin@...gle.com, groeck@...gle.com,
mfaltesek@...gle.com, gregkh@...uxfoundation.org
Subject: Re: [PATCH v2 3/3] nfc: st21nfca: fix incorrect sizing calculations
in EVT_TRANSACTION
On 01/04/2022 20:10, Martin Faltesek wrote:
> The transaction buffer is allocated by using the size of the packet buf,
> and subtracting two which seem intended to remove the two tags which are
> not present in the target structure. This calculation leads to under
> counting memory because of differences between the packet contents and the
> target structure. The aid_len field is a u8 in the packet, but a u32 in
> the structure, resulting in at least 3 bytes always being under counted.
> Further, the aid data is a variable length field in the packet, but fixed
> in the structure, so if this field is less than the max, the difference is
> added to the under counting.
>
> The last validation check for transaction->params_len is also incorrect
> since it employs the same accounting error.
>
> To fix, perform validation checks progressively to safely reach the
> next field, to determine the size of both buffers and verify both tags.
> Once all validation checks pass, allocate the buffer and copy the data.
> This eliminates freeing memory on the error path, as those checks are
> moved ahead of memory allocation.
>
> Fixes: 26fc6c7f02cb ("NFC: st21nfca: Add HCI transaction event support")
> Fixes: 4fbcc1a4cb20 ("nfc: st21nfca: Fix potential buffer overflows in EVT_TRANSACTION")
> Signed-off-by: Martin Faltesek <mfaltesek@...gle.com>
Your SoB does not match sender's email. Please fix (previous patches
maybe as well).
> ---
> drivers/nfc/st21nfca/se.c | 58 ++++++++++++++++++++-------------------
> 1 file changed, 30 insertions(+), 28 deletions(-)
>
Best regards,
Krzysztof
Powered by blists - more mailing lists