From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
To: Martin Faltesek <mfaltesek@google.com>, kuba@kernel.org
Cc: christophe.ricard@gmail.com, gregkh@linuxfoundation.org,
groeck@google.com, jordy@pwning.systems, krzk@kernel.org,
martin.faltesek@gmail.com, netdev@vger.kernel.org,
linux-nfc@lists.01.org, wklin@google.com,
theflamefire89@gmail.com, stable@vger.kernel.org
Subject: [linux-nfc] Re: [PATCH net v3 3/3] nfc: st21nfca: fix incorrect sizing calculations in EVT_TRANSACTION
Date: Wed, 8 Jun 2022 09:09:55 +0200 [thread overview]
Message-ID: <9d387882-3c9a-5056-9ee3-81ab6ea0a9a6@linaro.org> (raw)
In-Reply-To: <20220607025729.1673212-4-mfaltesek@google.com>
On 07/06/2022 04:57, 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")
> Cc: stable@vger.kernel.org
> Signed-off-by: Martin Faltesek <mfaltesek@google.com>
> ---
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Best regards,
Krzysztof
_______________________________________________
Linux-nfc mailing list -- linux-nfc@lists.01.org
To unsubscribe send an email to linux-nfc-leave@lists.01.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
next prev parent reply other threads:[~2022-06-08 7:10 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20220607025729.1673212-1-mfaltesek@google.com>
[not found] ` <20220607025729.1673212-2-mfaltesek@google.com>
2022-06-07 17:13 ` [linux-nfc] Re: [PATCH net v3 1/3] nfc: st21nfca: fix incorrect validating logic in EVT_TRANSACTION Krzysztof Kozlowski
[not found] ` <20220607025729.1673212-3-mfaltesek@google.com>
2022-06-07 17:15 ` [linux-nfc] Re: [PATCH net v3 2/3] nfc: st21nfca: fix memory leaks in EVT_TRANSACTION handling Krzysztof Kozlowski
[not found] ` <20220607025729.1673212-4-mfaltesek@google.com>
2022-06-08 7:09 ` Krzysztof Kozlowski [this message]
[not found] ` <fc85ff14-70d6-0c3e-247d-eda2284a5f6b@oracle.com>
2022-07-20 14:53 ` [linux-nfc] Re: [PATCH net v3 0/3] Split "nfc: st21nfca: Refactor EVT_TRANSACTION" into 3 Martin Faltesek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9d387882-3c9a-5056-9ee3-81ab6ea0a9a6@linaro.org \
--to=krzysztof.kozlowski@linaro.org \
--cc=christophe.ricard@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=groeck@google.com \
--cc=jordy@pwning.systems \
--cc=krzk@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-nfc@lists.01.org \
--cc=martin.faltesek@gmail.com \
--cc=mfaltesek@google.com \
--cc=netdev@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=theflamefire89@gmail.com \
--cc=wklin@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).