| Message ID | 20170406165859.GV29622@ZenIV.linux.org.uk (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Samuel Ortiz |
| Headers | show |
On Thu, Apr 06, 2017 at 05:58:59PM +0100, Al Viro wrote: > On Thu, Apr 06, 2017 at 05:48:47PM +0100, Al Viro wrote: > > * use unaligned.h, not unaligned/access_ok.h > > ... which got misspelled in that patch, sorry... Fixed variant follows: > > commit b3e79ba1708c9b74781079c9f8617448fce36b51 > Author: Al Viro <viro@zeniv.linux.org.uk> > Date: Thu Apr 6 12:42:14 2017 -0400 > > nfc: fix get_unaligned_...() misuses > > * use unaligned.h, not unaligned/access_ok.h > * if a local variable of type uint16_t is unaligned, your compiler is FUBAR > * the whole point of get_unaligned_... is to avoid memcpy + ..._to_cpu(). > Using it *after* memcpy() (into aligned object, no less) is pointless. > > Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Partly applied to nfc-next. The unaligned/access_ok.h replacements were already applied. Cheers, Samuel.
diff --git a/drivers/nfc/nfcmrvl/fw_dnld.c b/drivers/nfc/nfcmrvl/fw_dnld.c index f8dcdf4b24f6..ad1f0624ceee 100644 --- a/drivers/nfc/nfcmrvl/fw_dnld.c +++ b/drivers/nfc/nfcmrvl/fw_dnld.c @@ -17,11 +17,11 @@ */ #include <linux/module.h> -#include <linux/unaligned/access_ok.h> #include <linux/firmware.h> #include <linux/nfc.h> #include <net/nfc/nci.h> #include <net/nfc/nci_core.h> +#include <asm/unaligned.h> #include "nfcmrvl.h" #define FW_DNLD_TIMEOUT 15000 @@ -281,12 +281,11 @@ static int process_state_fw_dnld(struct nfcmrvl_private *priv, return -EINVAL; } skb_pull(skb, 1); - memcpy(&len, skb->data, 2); + len = get_unaligned_le16(skb->data); skb_pull(skb, 2); + comp_len = get_unaligned_le16(skb->data); memcpy(&comp_len, skb->data, 2); skb_pull(skb, 2); - len = get_unaligned_le16(&len); - comp_len = get_unaligned_le16(&comp_len); if (((~len) & 0xFFFF) != comp_len) { nfc_err(priv->dev, "bad len complement: %x %x %x", len, comp_len, (~len & 0xFFFF)); diff --git a/drivers/nfc/nxp-nci/firmware.c b/drivers/nfc/nxp-nci/firmware.c index 5291797324ba..553011f58339 100644 --- a/drivers/nfc/nxp-nci/firmware.c +++ b/drivers/nfc/nxp-nci/firmware.c @@ -24,7 +24,7 @@ #include <linux/completion.h> #include <linux/firmware.h> #include <linux/nfc.h> -#include <linux/unaligned/access_ok.h> +#include <asm/unaligned.h> #include "nxp-nci.h" diff --git a/drivers/nfc/nxp-nci/i2c.c b/drivers/nfc/nxp-nci/i2c.c index 36099e557730..9da35d2898fc 100644 --- a/drivers/nfc/nxp-nci/i2c.c +++ b/drivers/nfc/nxp-nci/i2c.c @@ -36,7 +36,6 @@ #include <linux/of_gpio.h> #include <linux/of_irq.h> #include <linux/platform_data/nxp-nci.h> -#include <linux/unaligned/access_ok.h> #include <net/nfc/nfc.h> @@ -127,7 +126,7 @@ static int nxp_nci_i2c_fw_read(struct nxp_nci_i2c_phy *phy, goto fw_read_exit; } - frame_len = (get_unaligned_be16(&header) & NXP_NCI_FW_FRAME_LEN_MASK) + + frame_len = (be16_to_cpu(header) & NXP_NCI_FW_FRAME_LEN_MASK) + NXP_NCI_FW_CRC_LEN; *skb = alloc_skb(NXP_NCI_FW_HDR_LEN + frame_len, GFP_KERNEL);