From: Dan Carpenter <dan.carpenter@oracle.com>
To: Suren Baghdasaryan <surenb@google.com>
Cc: Kees Cook <keescook@chromium.org>,
Security Officers <security@kernel.org>,
Kevin Deus <kdeus@google.com>,
Samuel Ortiz <sameo@linux.intel.com>,
"David S. Miller" <davem@davemloft.net>,
Allen Pais <allen.pais@oracle.com>,
linux-wireless <linux-wireless@vger.kernel.org>,
Network Development <netdev@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 1/1] NFC: Fix possible memory corruption when handling SHDLC I-Frame commands
Date: Fri, 17 Aug 2018 15:06:50 +0300 [thread overview]
Message-ID: <20180817120650.6mx6icxif2o52qyx@mwanda> (raw)
In-Reply-To: <CAJuCfpH9n2vVjBF7RoMNng3T=URY1eusKfbVGyq44LWcjwNTPw@mail.gmail.com>
On Wed, Aug 15, 2018 at 09:40:13AM -0700, Suren Baghdasaryan wrote:
> On Wed, Aug 15, 2018 at 1:29 AM, Dan Carpenter <dan.carpenter@oracle.com> wrote:
> > On Tue, Aug 14, 2018 at 03:38:14PM -0700, Suren Baghdasaryan wrote:
> >> The separate fix for the size of pipes[] array is posted here:
> >> https://lkml.org/lkml/2018/8/14/1034
> >> Thanks!
> >>
> >
> > That's great! Let's add some bounds checking to nfc_hci_msg_rx_work()
> > and nfc_hci_recv_from_llc() as well and then we can close the chapter on
> > these bugs.
>
> Dan, I don't think we need additional checks there. Here are the
> relevant parts of the code in nfc_hci_recv_from_llc():
>
Sorry, I meant after that at the end of the function:
net/nfc/hci/core.c
902 /* if this is a response, dispatch immediately to
903 * unblock waiting cmd context. Otherwise, enqueue to dispatch
904 * in separate context where handler can also execute command.
905 */
906 packet = (struct hcp_packet *)hcp_skb->data;
907 type = HCP_MSG_GET_TYPE(packet->message.header);
908 if (type == NFC_HCI_HCP_RESPONSE) {
909 pipe = packet->header;
^^^^^^^^^^^^^^^^^^^^^
Pipe can go up to 255.
910 instruction = HCP_MSG_GET_CMD(packet->message.header);
911 skb_pull(hcp_skb, NFC_HCI_HCP_PACKET_HEADER_LEN +
912 NFC_HCI_HCP_MESSAGE_HEADER_LEN);
913 nfc_hci_hcp_message_rx(hdev, pipe, type, instruction, hcp_skb);
^^^^
Then inside the nfc_hci_hcp_message_rx() function we call
nfc_hci_cmd_received() and nfc_hci_event_received() which use it as an
array index.
914 } else {
915 skb_queue_tail(&hdev->msg_rx_queue, hcp_skb);
916 schedule_work(&hdev->msg_rx_work);
917 }
918 }
It's the same thing when nfc_hci_hcp_message_rx() is called from
nfc_hci_msg_rx_work():
138 static void nfc_hci_msg_rx_work(struct work_struct *work)
139 {
140 struct nfc_hci_dev *hdev = container_of(work, struct nfc_hci_dev,
141 msg_rx_work);
142 struct sk_buff *skb;
143 struct hcp_message *message;
144 u8 pipe;
145 u8 type;
146 u8 instruction;
147
148 while ((skb = skb_dequeue(&hdev->msg_rx_queue)) != NULL) {
149 pipe = skb->data[0];
^^^^^^^^^^^^^^^^^^^
150 skb_pull(skb, NFC_HCI_HCP_PACKET_HEADER_LEN);
151 message = (struct hcp_message *)skb->data;
152 type = HCP_MSG_GET_TYPE(message->header);
153 instruction = HCP_MSG_GET_CMD(message->header);
154 skb_pull(skb, NFC_HCI_HCP_MESSAGE_HEADER_LEN);
155
156 nfc_hci_hcp_message_rx(hdev, pipe, type, instruction, skb);
^^^^
157 }
158 }
regards,
dan carpenter
next prev parent reply other threads:[~2018-08-17 12:07 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-13 22:39 [PATCH 1/1] NFC: Fix possible memory corruption when handling SHDLC I-Frame commands Suren Baghdasaryan
2018-08-14 0:28 ` Kees Cook
2018-08-14 9:21 ` Greg KH
2018-08-14 9:54 ` Dan Carpenter
2018-08-14 16:57 ` Suren Baghdasaryan
2018-08-14 20:26 ` Suren Baghdasaryan
2018-08-14 20:33 ` Kees Cook
2018-08-14 20:55 ` Suren Baghdasaryan
2018-08-14 21:49 ` Kees Cook
2018-08-14 22:19 ` Suren Baghdasaryan
2018-08-14 22:38 ` Suren Baghdasaryan
2018-08-15 8:29 ` Dan Carpenter
2018-08-15 16:40 ` Suren Baghdasaryan
2018-08-17 12:06 ` Dan Carpenter [this message]
2018-08-17 14:47 ` Dan Carpenter
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=20180817120650.6mx6icxif2o52qyx@mwanda \
--to=dan.carpenter@oracle.com \
--cc=allen.pais@oracle.com \
--cc=davem@davemloft.net \
--cc=kdeus@google.com \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sameo@linux.intel.com \
--cc=security@kernel.org \
--cc=surenb@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).