From nobody Mon Jun 19 13:08:39 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ql97W47FXz4g5fs; Mon, 19 Jun 2023 13:08:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ql97W35VXz3qvQ; Mon, 19 Jun 2023 13:08:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687180119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zygSNDpKOfB3HLzn9fssvSpcEYXA3QWjLy1g9NsGAqU=; b=cYz7+zn1Rb3WO6w5YUFkCWNS9u1/c5ypQHvyZSPI/m/lgRxFsQvH7sGVOZH9Vvjmm9VKk8 +rG1cNSoe26bngtuZFYwvUp3A5eWayDm+NxAqK8w4F11KuyNkzTNFak0sQ9oNqFebewk7T 0xKtUiY58/fJba1FrFp75vbzvt26MTUL1DazAob+StEk+BxNGQhOwmCSiB19TYE/rUsrb6 Ttc4VME5f6FuUamCoFktwH6ig3atejzhWCWWuzgD+Nf/5f/eRyetp1VuY3sBL4COOcFZue +Q/1I8njazzKaF0iTrFgPLyXo+Ukhf3Keq+t0fnsbAv6vulFyyHOrUptARN1HQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687180119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zygSNDpKOfB3HLzn9fssvSpcEYXA3QWjLy1g9NsGAqU=; b=AvgRQWIyjn3/zmVRVjzw07Alx38GVFQL2RxJ8ss3XAKe7D0opJD02E4Jq2UnV81TzaAe/4 ym/VtyrrPyQMuJZQDa/hP2aNDwqayoctmPKhnDKeEU/Sa7h4JxSHuzbB0vR+A28aY9yJgh XRoMfnBkAw+4BxXu6M3mssoNN1o/erTh/2uOcKkLZHXyCXJKfFsZBap8gonIrG2hFiJ1Dm wsnOGB0ZDZyCE+zQx+hkGxKoErAHkX120nc8/Hb7kZl0fgTs0XDpHO+mN/tL9TiREfCD/M qam4ctuhwwFqmUoPSUgo3G8iwQLyvnswbaYG2JVh+4Ihq7S7g2YynN0+BSwNqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687180119; a=rsa-sha256; cv=none; b=e2d4ZbDAvAtYxtNgYgntdZJqbcEwgBFEVN+twn2Ix0RvmE7e7TkSxuzyvaaYAEZ24Q6nlt TmnKlPpxSW+cW93C+XIV1ceSoarVkCxFK+BK23kXhaCTPKJbTbrr1PQCp8RCNZZoiPOlhp H+FSsFw+DdSaSmviPHsKhVLSSKvduga3egLxnsOmZy7/lkmaNOsUsZyIdICsaV54zuO0j1 41BTc4DHLFnKdViQ5GBsMClk6kiJ/wCP5mruvoJtDPOnZm7FlfvqdEybyE+ExBs/WP3gy6 s4M1e9QmGiHrA6DaXHROt9OgAyOwF0SH2V9sPMvLtxsTBNuDaL6odd9H1/s+8A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ql97W2CFhzJW6; Mon, 19 Jun 2023 13:08:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35JD8dSI035533; Mon, 19 Jun 2023 13:08:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35JD8dkQ035532; Mon, 19 Jun 2023 13:08:39 GMT (envelope-from git) Date: Mon, 19 Jun 2023 13:08:39 GMT Message-Id: <202306191308.35JD8dkQ035532@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 0d2318bbb4cc - stable/13 - crypto: Advance the correct pointer in crypto_cursor_copydata() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0d2318bbb4ccd89f1e698b93dc06448b1fdffb74 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0d2318bbb4ccd89f1e698b93dc06448b1fdffb74 commit 0d2318bbb4ccd89f1e698b93dc06448b1fdffb74 Author: Mark Johnston AuthorDate: 2023-06-12 16:09:54 +0000 Commit: Mark Johnston CommitDate: 2023-06-19 12:57:08 +0000 crypto: Advance the correct pointer in crypto_cursor_copydata() PR: 271766 Reported by: Michael Laß MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40468 (cherry picked from commit 9f7fdd8c1ab153104275e59b49b2d567cec95256) --- sys/opencrypto/criov.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/opencrypto/criov.c b/sys/opencrypto/criov.c index 2c3bc6b37cb9..ded1d8bd1df3 100644 --- a/sys/opencrypto/criov.c +++ b/sys/opencrypto/criov.c @@ -607,7 +607,7 @@ crypto_cursor_copydata(struct crypto_buffer_cursor *cc, int size, void *vdst) remain = MIN(PAGE_SIZE - cc->cc_offset, cc->cc_buf_len); todo = MIN(remain, size); memcpy(dst, src, todo); - src += todo; + dst += todo; cc->cc_buf_len -= todo; if (todo < remain) { cc->cc_offset += todo;