From patchwork Wed Dec 27 09:35:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengming Zhou X-Patchwork-Id: 183449 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp1331661dyb; Wed, 27 Dec 2023 01:35:59 -0800 (PST) X-Google-Smtp-Source: AGHT+IFsB6sTO2VMRSGgNEqTPskM0wBlG3Yrot1pBhq7p6brpH+FNmzbmVwFGHsdkKE0xJAeSLOy X-Received: by 2002:a05:6602:3f93:b0:7ba:b637:fcdc with SMTP id fb19-20020a0566023f9300b007bab637fcdcmr10295350iob.40.1703669759123; Wed, 27 Dec 2023 01:35:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703669759; cv=none; d=google.com; s=arc-20160816; b=CFoXSHWsoQ9VkDfCKBYEuidjf8rWGKgGfZst36AqV5VYppghoHlcYr9Z8G19ybAW3l KsBAaco7VQjb7bLLypBHkVIDUuMepdT0Sr3ZcDCwA6MhTh62Uzy8KNOFO/+q4I4XNZnt 5I8qm6iJw4+N5BQOvGX3BdEry/acg5GZJOshYKXKkyE+wqBTAJubnEr2ghVOWsJi0uLz rRgurWdiat3C65gf/MWUpcJeG7pB9Ab7hFHwCLzEvZq1Nk+US+VXYtPqlcloE18CZ62E +v1Z0YJH/wieDJi4R440m4XDzGjajRd0NqlGBQvxsivIB25+kiSnDGkqlOzCgJAj8b/0 EzeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=WEC4zcxwHKDFTEYmQ6GdpdDwW3vxNmvaojdQff3FHAk=; fh=kB37YKnXwto0n2PeWnHiaXro5DFlj+MeV7LqMVMDhb4=; b=0gwfI++jomy8vi3hEx2QnTQ5z/JZkYqf24o0Z2f6MgI3QuuMHuQifMfOnr1KKcJwIJ vTJ5T6i3XdoNWjDDBo6nxgJXoe5KcfT+4s4wSxZTQ38mqlSenttsifGoxVVJQo4Xiat/ q6rZrlurBkyFJpPhPc1PCwyzUSzwlX6ogWdWjzA+StCJ5GOu4lgPuBUBhaQjrpwWmg4w VsuBmCMRzoD40Zt7Ic0vfDPvtnYepcQj6XJ6kZmgbUID+93En3umcGfwPzt+Mx4s1XLw 7urPQyE61NhLYsZTDRMSKLsmM9YtbS668GvX+RyJk5fv4C78yaGvu9KemMe6Sd+PClXW 6hpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=Fv1yKosl; spf=pass (google.com: domain of linux-kernel+bounces-11939-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-11939-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id bq7-20020a056a02044700b005cdfc9ab80csi8079094pgb.396.2023.12.27.01.35.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Dec 2023 01:35:59 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-11939-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=Fv1yKosl; spf=pass (google.com: domain of linux-kernel+bounces-11939-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-11939-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id DC69B282AD8 for ; Wed, 27 Dec 2023 09:35:58 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9CEBA2DF92; Wed, 27 Dec 2023 09:35:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="Fv1yKosl" X-Original-To: linux-kernel@vger.kernel.org Received: from out-171.mta0.migadu.com (out-171.mta0.migadu.com [91.218.175.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3AC312D787 for ; Wed, 27 Dec 2023 09:35:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1703669738; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WEC4zcxwHKDFTEYmQ6GdpdDwW3vxNmvaojdQff3FHAk=; b=Fv1yKoslVKu0i9egT0ibBU1nyc4CKUyHnyH+qi17lqjCS0jj0JYBrxMwvMLV7hvhNxbM/p HpIykdOBZY0q/858UD8D0zRuJoUv2iUHGpuS7VKIxeliXcaOOblewxHuLdjcyAcsCbzghF bKen7TGflyzTOf6YUpJLzfFIK0zaKew= From: chengming.zhou@linux.dev To: akpm@linux-foundation.org, chrisl@kernel.org, davem@davemloft.net, herbert@gondor.apana.org.au, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, nphamcs@gmail.com, syzkaller-bugs@googlegroups.com, yosryahmed@google.com, 21cnbao@gmail.com Cc: zhouchengming@bytedance.com, syzbot+3eff5e51bf1db122a16e@syzkaller.appspotmail.com Subject: [PATCH v2] crypto: scompress - fix req->dst buffer overflow Date: Wed, 27 Dec 2023 09:35:23 +0000 Message-Id: <20231227093523.2735484-1-chengming.zhou@linux.dev> In-Reply-To: <0000000000000b05cd060d6b5511@google.com> References: <0000000000000b05cd060d6b5511@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1786416916508003782 X-GMAIL-MSGID: 1786427221526565795 From: Chengming Zhou The req->dst buffer size should be checked before copying from the scomp_scratch->dst to avoid req->dst buffer overflow problem. Fixes: 1ab53a77b772 ("crypto: acomp - add driver-side scomp interface") Reported-by: syzbot+3eff5e51bf1db122a16e@syzkaller.appspotmail.com Closes: https://lore.kernel.org/all/0000000000000b05cd060d6b5511@google.com/ Signed-off-by: Chengming Zhou Reviewed-by: Barry Song --- v2: - change error code to ENOSPC. --- crypto/scompress.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/crypto/scompress.c b/crypto/scompress.c index 442a82c9de7d..b108a30a7600 100644 --- a/crypto/scompress.c +++ b/crypto/scompress.c @@ -117,6 +117,7 @@ static int scomp_acomp_comp_decomp(struct acomp_req *req, int dir) struct crypto_scomp *scomp = *tfm_ctx; void **ctx = acomp_request_ctx(req); struct scomp_scratch *scratch; + unsigned int dlen; int ret; if (!req->src || !req->slen || req->slen > SCOMP_SCRATCH_SIZE) @@ -128,6 +129,8 @@ static int scomp_acomp_comp_decomp(struct acomp_req *req, int dir) if (!req->dlen || req->dlen > SCOMP_SCRATCH_SIZE) req->dlen = SCOMP_SCRATCH_SIZE; + dlen = req->dlen; + scratch = raw_cpu_ptr(&scomp_scratch); spin_lock(&scratch->lock); @@ -145,6 +148,9 @@ static int scomp_acomp_comp_decomp(struct acomp_req *req, int dir) ret = -ENOMEM; goto out; } + } else if (req->dlen > dlen) { + ret = -ENOSPC; + goto out; } scatterwalk_map_and_copy(scratch->dst, req->dst, 0, req->dlen, 1);