From 7bdc68703d1d7d4f0c26b40ac36bd5a7fe6878a0 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 15 Jun 2024 12:57:21 +0200 Subject: [PATCH] fix up nfc patch --- .../nfc-nci-fix-uninit-value-in-nci_rx_work.patch | 13 ++++--------- .../nfc-nci-fix-uninit-value-in-nci_rx_work.patch | 13 ++++--------- .../nfc-nci-fix-uninit-value-in-nci_rx_work.patch | 13 ++++--------- 3 files changed, 12 insertions(+), 27 deletions(-) diff --git a/queue-4.19/nfc-nci-fix-uninit-value-in-nci_rx_work.patch b/queue-4.19/nfc-nci-fix-uninit-value-in-nci_rx_work.patch index 1e9ebf26ea3..0ead0fdff6c 100644 --- a/queue-4.19/nfc-nci-fix-uninit-value-in-nci_rx_work.patch +++ b/queue-4.19/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 1f863ccf21211..6e83159b7b436 100644 --- a/net/nfc/nci/core.c +++ b/net/nfc/nci/core.c -@@ -1461,6 +1461,19 @@ int nci_core_ntf_packet(struct nci_dev *ndev, __u16 opcode, +@@ -1461,6 +1461,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 1f863ccf21211..6e83159b7b436 100644 /* ---- NCI TX Data worker thread ---- */ static void nci_tx_work(struct work_struct *work) -@@ -1511,7 +1524,7 @@ static void nci_rx_work(struct work_struct *work) +@@ -1511,7 +1524,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 1f863ccf21211..6e83159b7b436 100644 kfree_skb(skb); break; } --- -2.43.0 - diff --git a/queue-5.10/nfc-nci-fix-uninit-value-in-nci_rx_work.patch b/queue-5.10/nfc-nci-fix-uninit-value-in-nci_rx_work.patch index cd2340a1822..9050fa9c8f5 100644 --- a/queue-5.10/nfc-nci-fix-uninit-value-in-nci_rx_work.patch +++ b/queue-5.10/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 d8002065baaef..7b3f3d6285004 100644 --- a/net/nfc/nci/core.c +++ b/net/nfc/nci/core.c -@@ -1452,6 +1452,19 @@ int nci_core_ntf_packet(struct nci_dev *ndev, __u16 opcode, +@@ -1452,6 +1452,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 d8002065baaef..7b3f3d6285004 100644 /* ---- NCI TX Data worker thread ---- */ static void nci_tx_work(struct work_struct *work) -@@ -1502,7 +1515,7 @@ static void nci_rx_work(struct work_struct *work) +@@ -1502,7 +1515,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 d8002065baaef..7b3f3d6285004 100644 kfree_skb(skb); break; } --- -2.43.0 - diff --git a/queue-5.4/nfc-nci-fix-uninit-value-in-nci_rx_work.patch b/queue-5.4/nfc-nci-fix-uninit-value-in-nci_rx_work.patch index 9264a410206..5fdd15323d0 100644 --- a/queue-5.4/nfc-nci-fix-uninit-value-in-nci_rx_work.patch +++ b/queue-5.4/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 701c3752bda09..61b12281ec47c 100644 --- a/net/nfc/nci/core.c +++ b/net/nfc/nci/core.c -@@ -1449,6 +1449,19 @@ int nci_core_ntf_packet(struct nci_dev *ndev, __u16 opcode, +@@ -1449,6 +1449,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 701c3752bda09..61b12281ec47c 100644 /* ---- NCI TX Data worker thread ---- */ static void nci_tx_work(struct work_struct *work) -@@ -1499,7 +1512,7 @@ static void nci_rx_work(struct work_struct *work) +@@ -1499,7 +1512,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 701c3752bda09..61b12281ec47c 100644 kfree_skb(skb); break; } --- -2.43.0 - -- 2.47.3