From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E835CC47088 for ; Fri, 2 Dec 2022 21:36:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234602AbiLBVgm (ORCPT ); Fri, 2 Dec 2022 16:36:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49212 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234591AbiLBVgk (ORCPT ); Fri, 2 Dec 2022 16:36:40 -0500 Received: from mail-pl1-x631.google.com (mail-pl1-x631.google.com [IPv6:2607:f8b0:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D9F43EF8AF for ; Fri, 2 Dec 2022 13:36:39 -0800 (PST) Received: by mail-pl1-x631.google.com with SMTP id k7so5786690pll.6 for ; Fri, 02 Dec 2022 13:36:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=wureQ2qHtZ8FEnEt+jaoug1YKpvv7rP1J/7SReRkYJ8=; b=QDIGjmAmOXPF7Ul3FS6FHx0iflkF4dMQa6d5IBEKy0f+NWJ/mYld/Kxxq+UK8Lf8f0 hnfjuIVAUEtzd0WhDYa9+dHkhiQILUm9Eg7cnsW3khT/Px5R/DZShw4Ts+vvXCyjELY5 YKhUChcsQsV4STCBIuD/bLL7asv0VCZ4dIW7o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=wureQ2qHtZ8FEnEt+jaoug1YKpvv7rP1J/7SReRkYJ8=; b=uROIt8xg9RZW9/Nx8xL8awd+z36qDOFqtBQHp4NMrgw+krFReUfmcTNw7PiH2E7kYo IPn0WqsueVcKpHyT2pfFhptiJ3+KhKZsxT933Cz/V9oa2wu2FK6GG6WJ+lLCq7JyBBQm OYZZaBGR1Ekngwb4guiBb8zatSAacvaWo+diBFdnVnNhZtON2/TMBWA/PPFQdtm3bxir +pyhtVEFAAOUy+2XMEzzOGfsH0HjATjzjiyLPQQXn7wOoVh6BA8/5LqnXg2SJ9Hm1IrR ZiDYl043aepxA2zVh5FsAheBS2Vnj6LSVuewKoqv2ynA4WHAaHGsri0CQfiG4ZPYpDNl 5xmA== X-Gm-Message-State: ANoB5pmAX2alszc1VtrWeDCEFcxXQuPUfV9Jzc3eq66PN6UuYCfwZmQ3 UK4kslm5CSyKdCJ/QDja6zwzRHyx6YPZVlp5 X-Google-Smtp-Source: AA0mqf7xIkA06KJ6zAQvMBTblrXeAA8mcfDvwaXgp5RxM2ObJLfP1rkRxV2DUg8hZxWRO4VKsZ67WQ== X-Received: by 2002:a17:902:ce90:b0:187:19c4:373a with SMTP id f16-20020a170902ce9000b0018719c4373amr66948843plg.163.1670016988822; Fri, 02 Dec 2022 13:36:28 -0800 (PST) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id e1-20020a621e01000000b0057621a437d7sm3546989pfe.116.2022.12.02.13.36.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Dec 2022 13:36:28 -0800 (PST) Date: Fri, 2 Dec 2022 13:36:27 -0800 From: Kees Cook To: Krzysztof Kozlowski Cc: syzbot , davem@davemloft.net, edumazet@google.com, kuba@kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, pabeni@redhat.com, syzkaller-bugs@googlegroups.com Subject: Re: [syzbot] WARNING in nci_add_new_protocol Message-ID: <202212021327.FEABB55@keescook> References: <0000000000001c590f05ee7b3ff4@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <0000000000001c590f05ee7b3ff4@google.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, Nov 27, 2022 at 02:26:30PM -0800, syzbot wrote: > Hello, > > syzbot found the following issue on: > > HEAD commit: 4312098baf37 Merge tag 'spi-fix-v6.1-rc6' of git://git.ker.. > git tree: upstream > console output: https://syzkaller.appspot.com/x/log.txt?x=12e25bb5880000 > kernel config: https://syzkaller.appspot.com/x/.config?x=b1129081024ee340 > dashboard link: https://syzkaller.appspot.com/bug?extid=210e196cef4711b65139 > compiler: arm-linux-gnueabi-gcc (Debian 10.2.1-6) 10.2.1 20210110, GNU ld (GNU Binutils for Debian) 2.35.2 > userspace arch: arm > > Unfortunately, I don't have any reproducer for this issue yet. > > IMPORTANT: if you fix the issue, please add the following tag to the commit: > Reported-by: syzbot+210e196cef4711b65139@syzkaller.appspotmail.com > > ------------[ cut here ]------------ > WARNING: CPU: 0 PID: 7843 at net/nfc/nci/ntf.c:260 nci_add_new_protocol+0x268/0x30c net/nfc/nci/ntf.c:260 > memcpy: detected field-spanning write (size 129) of single field "target->sensf_res" at net/nfc/nci/ntf.c:260 (size 18) This looks like a legitimate overflow flaw to me. Likely introduced with commit 019c4fbaa790 ("NFC: Add NCI multiple targets support"). These appear to be explicitly filling fixed-size arrays: struct nfc_target { u32 idx; u32 supported_protocols; u16 sens_res; u8 sel_res; u8 nfcid1_len; u8 nfcid1[NFC_NFCID1_MAXSIZE]; u8 nfcid2_len; u8 nfcid2[NFC_NFCID2_MAXSIZE]; u8 sensb_res_len; u8 sensb_res[NFC_SENSB_RES_MAXSIZE]; u8 sensf_res_len; u8 sensf_res[NFC_SENSF_RES_MAXSIZE]; u8 hci_reader_gate; u8 logical_idx; u8 is_iso15693; u8 iso15693_dsfid; u8 iso15693_uid[NFC_ISO15693_UID_MAXSIZE]; }; static int nci_add_new_protocol(..., struct nfc_target *target, ...) { ... } else if (rf_tech_and_mode == NCI_NFC_B_PASSIVE_POLL_MODE) { nfcb_poll = (struct rf_tech_specific_params_nfcb_poll *)params; target->sensb_res_len = nfcb_poll->sensb_res_len; if (target->sensb_res_len > 0) { memcpy(target->sensb_res, nfcb_poll->sensb_res, target->sensb_res_len); } } else if (rf_tech_and_mode == NCI_NFC_F_PASSIVE_POLL_MODE) { nfcf_poll = (struct rf_tech_specific_params_nfcf_poll *)params; target->sensf_res_len = nfcf_poll->sensf_res_len; if (target->sensf_res_len > 0) { memcpy(target->sensf_res, nfcf_poll->sensf_res, target->sensf_res_len); } } else if (rf_tech_and_mode == NCI_NFC_V_PASSIVE_POLL_MODE) { nfcv_poll = (struct rf_tech_specific_params_nfcv_poll *)params; target->is_iso15693 = 1; target->iso15693_dsfid = nfcv_poll->dsfid; memcpy(target->iso15693_uid, nfcv_poll->uid, NFC_ISO15693_UID_MAXSIZE); } ... But the sizes are unbounds-checked, which means the buffers can be overwritten (as seen with the syzkaller report). Perhaps this to fix it? diff --git a/net/nfc/nci/ntf.c b/net/nfc/nci/ntf.c index 282c51051dcc..3a79f07bfea7 100644 --- a/net/nfc/nci/ntf.c +++ b/net/nfc/nci/ntf.c @@ -240,6 +240,8 @@ static int nci_add_new_protocol(struct nci_dev *ndev, target->sens_res = nfca_poll->sens_res; target->sel_res = nfca_poll->sel_res; target->nfcid1_len = nfca_poll->nfcid1_len; + if (target->nfcid1_len > ARRAY_SIZE(target->target->nfcid1)) + return -EPROTO; if (target->nfcid1_len > 0) { memcpy(target->nfcid1, nfca_poll->nfcid1, target->nfcid1_len); @@ -248,6 +250,8 @@ static int nci_add_new_protocol(struct nci_dev *ndev, nfcb_poll = (struct rf_tech_specific_params_nfcb_poll *)params; target->sensb_res_len = nfcb_poll->sensb_res_len; + if (target->sensb_res_len > ARRAY_SIZE(target->sensb_res)) + return -EPROTO; if (target->sensb_res_len > 0) { memcpy(target->sensb_res, nfcb_poll->sensb_res, target->sensb_res_len); @@ -256,6 +260,8 @@ static int nci_add_new_protocol(struct nci_dev *ndev, nfcf_poll = (struct rf_tech_specific_params_nfcf_poll *)params; target->sensf_res_len = nfcf_poll->sensf_res_len; + if (target->sensf_res_len > ARRAY_SIZE(target->sensf_res)) + return -EPROTO; if (target->sensf_res_len > 0) { memcpy(target->sensf_res, nfcf_poll->sensf_res, target->sensf_res_len); -- Kees Cook