From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
To: Siddh Raman Pant <code@siddh.me>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 4/4] nfc: llcp_sock_sendmsg: Reformat code to make the smaller block indented
Date: Mon, 27 Nov 2023 11:57:08 +0100 [thread overview]
Message-ID: <c51aa08d-944f-4d91-9cd0-c8a6ff6ceace@linaro.org> (raw)
In-Reply-To: <f5e1fc8131923c50d08fa30eb7136f32ddafe37d.1700943019.git.code@siddh.me>
On 25/11/2023 21:26, Siddh Raman Pant wrote:
> The block for datagram sending is a significantly bigger chunk of the
> function compared to the other scenario.
>
> Thus, put the significantly smaller block inside the if-block.
>
>
> + if (sk->sk_state != LLCP_BOUND) {
> release_sock(sk);
> -
> - return nfc_llcp_send_ui_frame(llcp_sock, addr->dsap, addr->ssap,
> - msg, len);
> + return -ENOTCONN;
> }
>
> - if (sk->sk_state != LLCP_CONNECTED) {
> + DECLARE_SOCKADDR(struct sockaddr_nfc_llcp *, addr, msg->msg_name);
No, this code is not readable. I don't think this change helps in anything.
> +
> + if (msg->msg_namelen < sizeof(*addr)) {
> release_sock(sk);
> - return -ENOTCONN;
> + return -EINVAL;
> }
>
> release_sock(sk);
>
> - return nfc_llcp_send_i_frame(llcp_sock, msg, len);
> + return nfc_llcp_send_ui_frame(llcp_sock, addr->dsap, addr->ssap,
> + msg, len);
> +
Stray blank line.
Best regards,
Krzysztof
next prev parent reply other threads:[~2023-11-27 10:57 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-25 20:26 [PATCH 0/4] Fix UAF caused by racing datagram sending and freeing of nfc_dev Siddh Raman Pant
2023-11-25 20:26 ` [PATCH 1/4] nfc: Extract nfc_dev access from nfc_alloc_send_skb() into the callers Siddh Raman Pant
2023-11-27 10:10 ` Krzysztof Kozlowski
2023-12-02 13:31 ` Siddh Raman Pant
2023-11-25 20:26 ` [PATCH 2/4] nfc: Protect access to nfc_dev in an llcp_sock with a rwlock Siddh Raman Pant
2023-11-27 10:38 ` Krzysztof Kozlowski
2023-12-02 13:30 ` Siddh Raman Pant
2023-11-25 20:26 ` [PATCH 3/4] nfc: Do not send datagram if socket state isn't LLCP_BOUND Siddh Raman Pant
2023-11-27 10:54 ` Krzysztof Kozlowski
2023-11-25 20:26 ` [PATCH 4/4] nfc: llcp_sock_sendmsg: Reformat code to make the smaller block indented Siddh Raman Pant
2023-11-27 10:57 ` Krzysztof Kozlowski [this message]
2023-11-27 10:04 ` [PATCH 0/4] Fix UAF caused by racing datagram sending and freeing of nfc_dev Krzysztof Kozlowski
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=c51aa08d-944f-4d91-9cd0-c8a6ff6ceace@linaro.org \
--to=krzysztof.kozlowski@linaro.org \
--cc=code@siddh.me \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.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
all inboxes | Powered by JetHome®