diff for duplicates of <20241118211413.3756-5-cel@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 716c40f..216b216 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,41 +1,54 @@ -From: Chuck Lever <chuck.lever@oracle.com> +[ Sasha's backport helper bot ] -[ Upstream commit 63fab04cbd0f96191b6e5beedc3b643b01c15889 ] +Hi, -Ensure the refcount and async_copies fields are initialized early. -cleanup_async_copy() will reference these fields if an error occurs -in nfsd4_copy(). If they are not correctly initialized, at the very -least, a refcount underflow occurs. +The upstream commit SHA1 provided is correct: 63fab04cbd0f96191b6e5beedc3b643b01c15889 -Reported-by: Olga Kornievskaia <okorniev@redhat.com> -Fixes: aadc3bbea163 ("NFSD: Limit the number of concurrent async COPY operations") -Reviewed-by: Jeff Layton <jlayton@kernel.org> -Tested-by: Olga Kornievskaia <okorniev@redhat.com> -Signed-off-by: Chuck Lever <chuck.lever@oracle.com> +WARNING: Author mismatch between patch and upstream commit: +Backport author: cel@kernel.org +Commit author: Chuck Lever <chuck.lever@oracle.com> + +Commit in newer trees: + +|-----------------|----------------------------------------------| +| 6.11.y | Present (different SHA1: e30a9a2f69c3) | +| 6.6.y | Not found | +|-----------------|----------------------------------------------| + +Note: The patch differs from the upstream commit: --- - fs/nfsd/nfs4proc.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c -index e74462fb480f..444f68ade80c 100644 ---- a/fs/nfsd/nfs4proc.c -+++ b/fs/nfsd/nfs4proc.c -@@ -1816,14 +1816,14 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, - if (!async_copy) - goto out_err; - async_copy->cp_nn = nn; -+ INIT_LIST_HEAD(&async_copy->copies); -+ refcount_set(&async_copy->refcount, 1); - /* Arbitrary cap on number of pending async copy operations */ - if (atomic_inc_return(&nn->pending_async_copies) > - (int)rqstp->rq_pool->sp_nrthreads) { - atomic_dec(&nn->pending_async_copies); - goto out_err; - } -- INIT_LIST_HEAD(&async_copy->copies); -- refcount_set(&async_copy->refcount, 1); - async_copy->cp_src = kmalloc(sizeof(*async_copy->cp_src), GFP_KERNEL); - if (!async_copy->cp_src) - goto out_err; --- -2.47.0 +--- - 2024-11-18 23:54:29.489312431 -0500 ++++ /tmp/tmp.oVuvgY7enX 2024-11-18 23:54:29.481985187 -0500 +@@ -1,3 +1,5 @@ ++[ Upstream commit 63fab04cbd0f96191b6e5beedc3b643b01c15889 ] ++ + Ensure the refcount and async_copies fields are initialized early. + cleanup_async_copy() will reference these fields if an error occurs + in nfsd4_copy(). If they are not correctly initialized, at the very +@@ -13,10 +15,10 @@ + 1 file changed, 2 insertions(+), 2 deletions(-) + + diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c +-index b5a6bf4f459fb..5fd1ce3fc8fb7 100644 ++index e74462fb480f..444f68ade80c 100644 + --- a/fs/nfsd/nfs4proc.c + +++ b/fs/nfsd/nfs4proc.c +-@@ -1841,14 +1841,14 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, ++@@ -1816,14 +1816,14 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, + if (!async_copy) + goto out_err; + async_copy->cp_nn = nn; +@@ -33,3 +35,6 @@ + async_copy->cp_src = kmalloc(sizeof(*async_copy->cp_src), GFP_KERNEL); + if (!async_copy->cp_src) + goto out_err; ++-- ++2.47.0 ++ +--- + +Results of testing on various branches: + +| Branch | Patch Apply | Build Test | +|---------------------------|-------------|------------| +| stable/linux-6.6.y | Success | Success | diff --git a/a/content_digest b/N1/content_digest index e5cc7aa..d6b7aa9 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,54 +1,64 @@ - "ref\020241118211413.3756-1-cel@kernel.org\0" - "From\0cel@kernel.org\0" - "Subject\0[PATCH 6.6 4/5] NFSD: Initialize struct nfsd4_copy earlier\0" - "Date\0Mon, 18 Nov 2024 16:14:12 -0500\0" - "To\0<stable@vger.kernel.org>\0" - "Cc\0<linux-nfs@vger.kernel.org>" - Jeff Layton <jlayton@kernel.org> - Chuck Lever <chuck.lever@oracle.com> - " Olga Kornievskaia <okorniev@redhat.com>\0" + "From\0Sasha Levin <sashal@kernel.org>\0" + "Subject\0Re: [PATCH 6.6 4/5] NFSD: Initialize struct nfsd4_copy earlier\0" + "Date\0Tue, 19 Nov 2024 07:30:57 -0500\0" + "To\0stable@vger.kernel.org\0" + "Cc\0cel@kernel.org" + " Sasha Levin <sashal@kernel.org>\0" "\00:1\0" "b\0" - "From: Chuck Lever <chuck.lever@oracle.com>\n" + "[ Sasha's backport helper bot ]\n" "\n" - "[ Upstream commit 63fab04cbd0f96191b6e5beedc3b643b01c15889 ]\n" + "Hi,\n" "\n" - "Ensure the refcount and async_copies fields are initialized early.\n" - "cleanup_async_copy() will reference these fields if an error occurs\n" - "in nfsd4_copy(). If they are not correctly initialized, at the very\n" - "least, a refcount underflow occurs.\n" + "The upstream commit SHA1 provided is correct: 63fab04cbd0f96191b6e5beedc3b643b01c15889\n" "\n" - "Reported-by: Olga Kornievskaia <okorniev@redhat.com>\n" - "Fixes: aadc3bbea163 (\"NFSD: Limit the number of concurrent async COPY operations\")\n" - "Reviewed-by: Jeff Layton <jlayton@kernel.org>\n" - "Tested-by: Olga Kornievskaia <okorniev@redhat.com>\n" - "Signed-off-by: Chuck Lever <chuck.lever@oracle.com>\n" + "WARNING: Author mismatch between patch and upstream commit:\n" + "Backport author: cel@kernel.org\n" + "Commit author: Chuck Lever <chuck.lever@oracle.com>\n" + "\n" + "Commit in newer trees:\n" + "\n" + "|-----------------|----------------------------------------------|\n" + "| 6.11.y | Present (different SHA1: e30a9a2f69c3) |\n" + "| 6.6.y | Not found |\n" + "|-----------------|----------------------------------------------|\n" + "\n" + "Note: The patch differs from the upstream commit:\n" "---\n" - " fs/nfsd/nfs4proc.c | 4 ++--\n" - " 1 file changed, 2 insertions(+), 2 deletions(-)\n" - "\n" - "diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c\n" - "index e74462fb480f..444f68ade80c 100644\n" - "--- a/fs/nfsd/nfs4proc.c\n" - "+++ b/fs/nfsd/nfs4proc.c\n" - "@@ -1816,14 +1816,14 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,\n" - " \t\tif (!async_copy)\n" - " \t\t\tgoto out_err;\n" - " \t\tasync_copy->cp_nn = nn;\n" - "+\t\tINIT_LIST_HEAD(&async_copy->copies);\n" - "+\t\trefcount_set(&async_copy->refcount, 1);\n" - " \t\t/* Arbitrary cap on number of pending async copy operations */\n" - " \t\tif (atomic_inc_return(&nn->pending_async_copies) >\n" - " \t\t\t\t(int)rqstp->rq_pool->sp_nrthreads) {\n" - " \t\t\tatomic_dec(&nn->pending_async_copies);\n" - " \t\t\tgoto out_err;\n" - " \t\t}\n" - "-\t\tINIT_LIST_HEAD(&async_copy->copies);\n" - "-\t\trefcount_set(&async_copy->refcount, 1);\n" - " \t\tasync_copy->cp_src = kmalloc(sizeof(*async_copy->cp_src), GFP_KERNEL);\n" - " \t\tif (!async_copy->cp_src)\n" - " \t\t\tgoto out_err;\n" - "-- \n" - 2.47.0 + "--- -\t2024-11-18 23:54:29.489312431 -0500\n" + "+++ /tmp/tmp.oVuvgY7enX\t2024-11-18 23:54:29.481985187 -0500\n" + "@@ -1,3 +1,5 @@\n" + "+[ Upstream commit 63fab04cbd0f96191b6e5beedc3b643b01c15889 ]\n" + "+\n" + " Ensure the refcount and async_copies fields are initialized early.\n" + " cleanup_async_copy() will reference these fields if an error occurs\n" + " in nfsd4_copy(). If they are not correctly initialized, at the very\n" + "@@ -13,10 +15,10 @@\n" + " 1 file changed, 2 insertions(+), 2 deletions(-)\n" + " \n" + " diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c\n" + "-index b5a6bf4f459fb..5fd1ce3fc8fb7 100644\n" + "+index e74462fb480f..444f68ade80c 100644\n" + " --- a/fs/nfsd/nfs4proc.c\n" + " +++ b/fs/nfsd/nfs4proc.c\n" + "-@@ -1841,14 +1841,14 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,\n" + "+@@ -1816,14 +1816,14 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,\n" + " \t\tif (!async_copy)\n" + " \t\t\tgoto out_err;\n" + " \t\tasync_copy->cp_nn = nn;\n" + "@@ -33,3 +35,6 @@\n" + " \t\tasync_copy->cp_src = kmalloc(sizeof(*async_copy->cp_src), GFP_KERNEL);\n" + " \t\tif (!async_copy->cp_src)\n" + " \t\t\tgoto out_err;\n" + "+-- \n" + "+2.47.0\n" + "+\n" + "---\n" + "\n" + "Results of testing on various branches:\n" + "\n" + "| Branch | Patch Apply | Build Test |\n" + "|---------------------------|-------------|------------|\n" + | stable/linux-6.6.y | Success | Success | -59d1676d63f063c76187d49e85559ec4c9eb3fa949fe0de2d0f69b4cdeec6937 +560ff865160a5a9d81606793b0588e5b6d4605bef33a42151e57fc07826ffca9
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.