nouveau/svm: Replace one-element array with flexible-array member
Subsystems (3)
cover nouveau/svm: Replace one-element array with flexible-array member
This small series aims to replace a one-element array with a flexible-array member in struct nouveau_svm. And, while at it, fix a checkpatch.pl error.
Gustavo A. R. Silva (2):
nouveau/svm: Replace one-element array with flexible-array member in
struct nouveau_svm
nouveau/svm: Split assignment from if conditional
drivers/gpu/drm/nouveau/nouveau_svm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
Signature · 1 line
2.34.1
PATCH 1/2 nouveau/svm: Replace one-element array with flexible-array member in struct nouveau_svm
One-element and zero-length arrays are deprecated. So, replace one-element array in struct nouveau_svm with flexible-array member.
This results in no differences in binary output.
--- drivers/gpu/drm/nouveau/nouveau_svm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/nouveau/nouveau_svm.c +2 -2
@@ -67,7 +67,7 @@ struct nouveau_svm {struct nouveau_svmm *svmm; } **fault;int fault_nr; - } buffer[1 ]; + } buffer[]; };#define FAULT_ACCESS_READ 0
@@ -1063,7 +1063,7 @@ nouveau_svm_init(struct nouveau_drm *drm)if (drm->client.device.info.family >NV_DEVICE_INFO_V0_PASCAL )return ; -if (!(drm->svm = svm =kzalloc (sizeof (*drm->svm),GFP_KERNEL ))) +if (!(drm->svm = svm =kzalloc (struct_size (drm->svm, buffer,1 ),GFP_KERNEL )))return ; drm->svm->drm = drm;
Signature · 1 line
2.34.1
PATCH 2/2 nouveau/svm: Split assignment from if conditional
In reply to Gustavo A. R. SilvaFix checkpatch.pl ERROR: do not use assignment in if condition.
--- drivers/gpu/drm/nouveau/nouveau_svm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/nouveau/nouveau_svm.c +2 -1
@@ -1063,7 +1063,8 @@ nouveau_svm_init(struct nouveau_drm *drm)if (drm->client.device.info.family >NV_DEVICE_INFO_V0_PASCAL )return ; -if (!(drm->svm = svm =kzalloc (struct_size (drm->svm, buffer,1 ),GFP_KERNEL ))) + drm->svm = svm =kzalloc (struct_size (drm->svm, buffer,1 ),GFP_KERNEL ); +if (!drm->svm)return ; drm->svm->drm = drm;
Signature · 1 line
2.34.1
Re: [PATCH 1/2][next] nouveau/svm: Replace one-element array with flexible-array member in struct nouveau_svm
In reply to Gustavo A. R. SilvaQuoted 7 lines · Gustavo A. R. Silva
One-element and zero-length arrays are deprecated. So, replace one-element array in struct
nouveau_svmwith flexible-array member.This results in no differences in binary output.
Signature · 1 line
Kees Cook
Re: [PATCH 2/2][next] nouveau/svm: Split assignment from if conditional
In reply to Gustavo A. R. SilvaQuoted 3 lines · Gustavo A. R. Silva
Fix checkpatch.pl ERROR: do not use assignment in if condition.
Signed-off-by Gustavo A. R. Silva <[email protected]>
Signature · 1 line
Kees Cook
Kees Cook
AppliedQuoted 10 lines · Gustavo A. R. Silva
This small series aims to replace a one-element array with a flexible-array member in struct
nouveau_svm. And, while at it, fix a checkpatch.pl error.Gustavo A. R. Silva (2):
nouveau/svm: Replace one-element array with flexible-array member in
structnouveau_svm
nouveau/svm: Split assignment from if conditional[...]
These look trivially correct and haven't had further feedback for over a month.
Applied to for-next/hardening, thanks!
[1/2] nouveau/svm: Replace one-element array with flexible-array member in struct nouveau_svm
https://git.kernel.org/kees/c/6ad33b53c9b8 [2/2] nouveau/svm: Split assignment from if conditional https://git.kernel.org/kees/c/4cb2e89fea5f
Take care,
Signature · 1 line
Kees Cook