* [PATCH net] nfc: fix potential illegal memory access
@ 2019-07-07 13:37 Yang Wei
2019-07-07 20:07 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Yang Wei @ 2019-07-07 13:37 UTC (permalink / raw)
To: netdev, linux-kernel; +Cc: davem, tglx, albin_yang
The frags_q is used before __skb_queue_head_init when conn_info is
NULL. It may result in illegal memory access.
Signed-off-by: Yang Wei <albin_yang@163.com>
---
net/nfc/nci/data.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/nfc/nci/data.c b/net/nfc/nci/data.c
index 0a0c265..b5f16cb 100644
--- a/net/nfc/nci/data.c
+++ b/net/nfc/nci/data.c
@@ -104,14 +104,14 @@ static int nci_queue_tx_data_frags(struct nci_dev *ndev,
pr_debug("conn_id 0x%x, total_len %d\n", conn_id, total_len);
+ __skb_queue_head_init(&frags_q);
+
conn_info = nci_get_conn_info_by_conn_id(ndev, conn_id);
if (!conn_info) {
rc = -EPROTO;
goto free_exit;
}
- __skb_queue_head_init(&frags_q);
-
while (total_len) {
frag_len =
min_t(int, total_len, conn_info->max_pkt_payload_len);
--
2.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH net] nfc: fix potential illegal memory access
2019-07-07 13:37 [PATCH net] nfc: fix potential illegal memory access Yang Wei
@ 2019-07-07 20:07 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2019-07-07 20:07 UTC (permalink / raw)
To: albin_yang; +Cc: netdev, linux-kernel, tglx
From: Yang Wei <albin_yang@163.com>
Date: Sun, 7 Jul 2019 21:37:40 +0800
> The frags_q is used before __skb_queue_head_init when conn_info is
> NULL. It may result in illegal memory access.
>
> Signed-off-by: Yang Wei <albin_yang@163.com>
> ---
> net/nfc/nci/data.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/net/nfc/nci/data.c b/net/nfc/nci/data.c
> index 0a0c265..b5f16cb 100644
> --- a/net/nfc/nci/data.c
> +++ b/net/nfc/nci/data.c
> @@ -104,14 +104,14 @@ static int nci_queue_tx_data_frags(struct nci_dev *ndev,
>
> pr_debug("conn_id 0x%x, total_len %d\n", conn_id, total_len);
>
> + __skb_queue_head_init(&frags_q);
> +
> conn_info = nci_get_conn_info_by_conn_id(ndev, conn_id);
> if (!conn_info) {
> rc = -EPROTO;
> goto free_exit;
> }
>
> - __skb_queue_head_init(&frags_q);
> -
Just change the goto into "goto exit;", much simpler one-line fix.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-07-07 20:07 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-07-07 13:37 [PATCH net] nfc: fix potential illegal memory access Yang Wei
2019-07-07 20:07 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox