lkml.org 
[lkml]   [2014]   [Oct]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16 237/357] NFC: microread: Potential overflows in microread_target_discovered()
    Date
    3.16-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Dan Carpenter <dan.carpenter@oracle.com>

    commit d07f1e8600ccb885c8f4143402b8912f7d827bcb upstream.

    Smatch says that skb->data is untrusted so we need to check to make sure
    that the memcpy() doesn't overflow.

    Fixes: cfad1ba87150 ('NFC: Initial support for Inside Secure microread')
    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/nfc/microread/microread.c | 16 ++++++++++++----
    1 file changed, 12 insertions(+), 4 deletions(-)

    --- a/drivers/nfc/microread/microread.c
    +++ b/drivers/nfc/microread/microread.c
    @@ -501,9 +501,13 @@ static void microread_target_discovered(
    targets->sens_res =
    be16_to_cpu(*(u16 *)&skb->data[MICROREAD_EMCF_A_ATQA]);
    targets->sel_res = skb->data[MICROREAD_EMCF_A_SAK];
    - memcpy(targets->nfcid1, &skb->data[MICROREAD_EMCF_A_UID],
    - skb->data[MICROREAD_EMCF_A_LEN]);
    targets->nfcid1_len = skb->data[MICROREAD_EMCF_A_LEN];
    + if (targets->nfcid1_len > sizeof(targets->nfcid1)) {
    + r = -EINVAL;
    + goto exit_free;
    + }
    + memcpy(targets->nfcid1, &skb->data[MICROREAD_EMCF_A_UID],
    + targets->nfcid1_len);
    break;
    case MICROREAD_GATE_ID_MREAD_ISO_A_3:
    targets->supported_protocols =
    @@ -511,9 +515,13 @@ static void microread_target_discovered(
    targets->sens_res =
    be16_to_cpu(*(u16 *)&skb->data[MICROREAD_EMCF_A3_ATQA]);
    targets->sel_res = skb->data[MICROREAD_EMCF_A3_SAK];
    - memcpy(targets->nfcid1, &skb->data[MICROREAD_EMCF_A3_UID],
    - skb->data[MICROREAD_EMCF_A3_LEN]);
    targets->nfcid1_len = skb->data[MICROREAD_EMCF_A3_LEN];
    + if (targets->nfcid1_len > sizeof(targets->nfcid1)) {
    + r = -EINVAL;
    + goto exit_free;
    + }
    + memcpy(targets->nfcid1, &skb->data[MICROREAD_EMCF_A3_UID],
    + targets->nfcid1_len);
    break;
    case MICROREAD_GATE_ID_MREAD_ISO_B:
    targets->supported_protocols = NFC_PROTO_ISO14443_B_MASK;



    \
     
     \ /
      Last update: 2014-10-04 02:41    [W:4.050 / U:0.200 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site