| Message ID | 20230513115204.179437-1-krzysztof.kozlowski@linaro.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 0d9b41daa5907756a31772d8af8ac5ff25cf17c1 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next,v2] nfc: llcp: fix possible use of uninitialized variable in nfc_llcp_send_connect() | expand |
Hello: This patch was applied to netdev/net-next.git (main) by David S. Miller <davem@davemloft.net>: On Sat, 13 May 2023 13:52:04 +0200 you wrote: > If sock->service_name is NULL, the local variable > service_name_tlv_length will not be assigned by nfc_llcp_build_tlv(), > later leading to using value frmo the stack. Smatch warning: > > net/nfc/llcp_commands.c:442 nfc_llcp_send_connect() error: uninitialized symbol 'service_name_tlv_length'. > > Fixes: de9e5aeb4f40 ("NFC: llcp: Fix usage of llcp_add_tlv()") > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > > [...] Here is the summary with links: - [net-next,v2] nfc: llcp: fix possible use of uninitialized variable in nfc_llcp_send_connect() https://git.kernel.org/netdev/net-next/c/0d9b41daa590 You are awesome, thank you!
diff --git a/net/nfc/llcp_commands.c b/net/nfc/llcp_commands.c index 41e3a20c8935..cdb001de0692 100644 --- a/net/nfc/llcp_commands.c +++ b/net/nfc/llcp_commands.c @@ -390,7 +390,8 @@ int nfc_llcp_send_connect(struct nfc_llcp_sock *sock) const u8 *service_name_tlv = NULL; const u8 *miux_tlv = NULL; const u8 *rw_tlv = NULL; - u8 service_name_tlv_length, miux_tlv_length, rw_tlv_length, rw; + u8 service_name_tlv_length = 0; + u8 miux_tlv_length, rw_tlv_length, rw; int err; u16 size = 0; __be16 miux;
If sock->service_name is NULL, the local variable service_name_tlv_length will not be assigned by nfc_llcp_build_tlv(), later leading to using value frmo the stack. Smatch warning: net/nfc/llcp_commands.c:442 nfc_llcp_send_connect() error: uninitialized symbol 'service_name_tlv_length'. Fixes: de9e5aeb4f40 ("NFC: llcp: Fix usage of llcp_add_tlv()") Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> --- Changes in v2: 1. Fix typo in subject prefix. --- net/nfc/llcp_commands.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)