From 3b7e14c1ab394d33dab6494d62b88623570db2ff Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 4 Jun 2024 14:40:23 +0200 Subject: [PATCH] fix up 5.15 nfc patch so it builds --- .../nfc-nci-fix-uninit-value-in-nci_rx_work.patch | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/queue-5.15/nfc-nci-fix-uninit-value-in-nci_rx_work.patch b/queue-5.15/nfc-nci-fix-uninit-value-in-nci_rx_work.patch index 9d231f3e5af..562f6d5e8ea 100644 --- a/queue-5.15/nfc-nci-fix-uninit-value-in-nci_rx_work.patch +++ b/queue-5.15/nfc-nci-fix-uninit-value-in-nci_rx_work.patch @@ -22,21 +22,19 @@ Reviewed-by: Krzysztof Kozlowski Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- - net/nfc/nci/core.c | 15 ++++++++++++++- + net/nfc/nci/core.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) -diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c -index 2a821f2b2ffe8..64c87b43035da 100644 --- a/net/nfc/nci/core.c +++ b/net/nfc/nci/core.c -@@ -1466,6 +1466,19 @@ int nci_core_ntf_packet(struct nci_dev *ndev, __u16 opcode, +@@ -1466,6 +1466,19 @@ int nci_core_ntf_packet(struct nci_dev * ndev->ops->n_core_ops); } +static bool nci_valid_size(struct sk_buff *skb) +{ -+ BUILD_BUG_ON(NCI_CTRL_HDR_SIZE != NCI_DATA_HDR_SIZE); + unsigned int hdr_size = NCI_CTRL_HDR_SIZE; ++ BUILD_BUG_ON(NCI_CTRL_HDR_SIZE != NCI_DATA_HDR_SIZE); + + if (skb->len < hdr_size || + !nci_plen(skb->data) || @@ -49,7 +47,7 @@ index 2a821f2b2ffe8..64c87b43035da 100644 /* ---- NCI TX Data worker thread ---- */ static void nci_tx_work(struct work_struct *work) -@@ -1516,7 +1529,7 @@ static void nci_rx_work(struct work_struct *work) +@@ -1516,7 +1529,7 @@ static void nci_rx_work(struct work_stru nfc_send_to_raw_sock(ndev->nfc_dev, skb, RAW_PAYLOAD_NCI, NFC_DIRECTION_RX); @@ -58,6 +56,3 @@ index 2a821f2b2ffe8..64c87b43035da 100644 kfree_skb(skb); break; } --- -2.43.0 - -- 2.47.3