2021-01-27 20:54:02

by Lee Duncan

Subject: [PATCH] fnic: fixup patch to resolve stack frame issues

From: Hannes Reinecke <[email protected]>

Commit 42ec15ceaea7 fixed a gcc issue with unused variables, but
introduced errors since it allocated an array of two u64-s but
then used more than that. Set the arrays to the proper size.

Fixes: 42ec15ceaea74b5f7a621fc6686cbf69ca66c4cf
Cc: [email protected]
Signed-off-by: Hannes Reinecke <[email protected]>
Signed-off-by: Lee Duncan <[email protected]>
---
drivers/scsi/fnic/vnic_dev.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/scsi/fnic/vnic_dev.c b/drivers/scsi/fnic/vnic_dev.c
index 5988c300cc82..d29999064b89 100644
--- a/drivers/scsi/fnic/vnic_dev.c
+++ b/drivers/scsi/fnic/vnic_dev.c
@@ -697,7 +697,7 @@ int vnic_dev_hang_notify(struct vnic_dev *vdev)

int vnic_dev_mac_addr(struct vnic_dev *vdev, u8 *mac_addr)
{
- u64 a[2] = {};
+ u64 a[ETH_ALEN] = {};
int wait = 1000;
int err, i;

@@ -734,7 +734,7 @@ void vnic_dev_packet_filter(struct vnic_dev *vdev, int directed, int multicast,

void vnic_dev_add_addr(struct vnic_dev *vdev, u8 *addr)
{
- u64 a[2] = {};
+ u64 a[ETH_ALEN] = {};
int wait = 1000;
int err;
int i;
@@ -749,7 +749,7 @@ void vnic_dev_add_addr(struct vnic_dev *vdev, u8 *addr)

void vnic_dev_del_addr(struct vnic_dev *vdev, u8 *addr)
{
- u64 a[2] = {};
+ u64 a[ETH_ALEN] = {};
int wait = 1000;
int err;
int i;
--
2.26.2

2021-01-27 21:17:31

by Lee Duncan

Subject: Re: [PATCH] fnic: fixup patch to resolve stack frame issues

On 1/26/21 5:21 PM, Lee Duncan wrote:
> From: Hannes Reinecke <[email protected]>
>
> Commit 42ec15ceaea7 fixed a gcc issue with unused variables, but
> introduced errors since it allocated an array of two u64-s but
> then used more than that. Set the arrays to the proper size.
>
> Fixes: 42ec15ceaea74b5f7a621fc6686cbf69ca66c4cf
> Cc: [email protected]
> Signed-off-by: Hannes Reinecke <[email protected]>
> Signed-off-by: Lee Duncan <[email protected]>
> ---
> drivers/scsi/fnic/vnic_dev.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/scsi/fnic/vnic_dev.c b/drivers/scsi/fnic/vnic_dev.c
> index 5988c300cc82..d29999064b89 100644
> --- a/drivers/scsi/fnic/vnic_dev.c
> +++ b/drivers/scsi/fnic/vnic_dev.c
> @@ -697,7 +697,7 @@ int vnic_dev_hang_notify(struct vnic_dev *vdev)
>
> int vnic_dev_mac_addr(struct vnic_dev *vdev, u8 *mac_addr)
> {
> - u64 a[2] = {};
> + u64 a[ETH_ALEN] = {};
> int wait = 1000;
> int err, i;
>
> @@ -734,7 +734,7 @@ void vnic_dev_packet_filter(struct vnic_dev *vdev, int directed, int multicast,
>
> void vnic_dev_add_addr(struct vnic_dev *vdev, u8 *addr)
> {
> - u64 a[2] = {};
> + u64 a[ETH_ALEN] = {};
> int wait = 1000;
> int err;
> int i;
> @@ -749,7 +749,7 @@ void vnic_dev_add_addr(struct vnic_dev *vdev, u8 *addr)
>
> void vnic_dev_del_addr(struct vnic_dev *vdev, u8 *addr)
> {
> - u64 a[2] = {};
> + u64 a[ETH_ALEN] = {};
> int wait = 1000;
> int err;
> int i;
>

This may not be correct. Please do not review this yet. I will re-submit
once I clear up my confusion.

--
Lee Duncan

2021-01-27 21:35:49

by Greg Kroah-Hartman

Subject: Re: [PATCH] fnic: fixup patch to resolve stack frame issues

On Tue, Jan 26, 2021 at 05:21:24PM -0800, Lee Duncan wrote:
> From: Hannes Reinecke <[email protected]>
>
> Commit 42ec15ceaea7 fixed a gcc issue with unused variables, but
> introduced errors since it allocated an array of two u64-s but
> then used more than that. Set the arrays to the proper size.
>
> Fixes: 42ec15ceaea74b5f7a621fc6686cbf69ca66c4cf

Please use the documented way to show sha1 commit ids to make it easier
to understand:

42ec15ceaea7 ("scsi: fnic: fix invalid stack access")

thanks,

greg k-h

2021-01-28 00:03:03

by Lee Duncan

Subject: Re: [PATCH] fnic: fixup patch to resolve stack frame issues

On 1/26/21 11:46 PM, Greg KH wrote:
> On Tue, Jan 26, 2021 at 05:21:24PM -0800, Lee Duncan wrote:
>> From: Hannes Reinecke <[email protected]>
>>
>> Commit 42ec15ceaea7 fixed a gcc issue with unused variables, but
>> introduced errors since it allocated an array of two u64-s but
>> then used more than that. Set the arrays to the proper size.
>>
>> Fixes: 42ec15ceaea74b5f7a621fc6686cbf69ca66c4cf
>
> Please use the documented way to show sha1 commit ids to make it easier
> to understand:
>
> 42ec15ceaea7 ("scsi: fnic: fix invalid stack access")
>
> thanks,
>
> greg k-h
>

I will Greg. Thank you.

Please delete this patch, though. It is not correct.

My apologies for the churn.
--
Lee Duncan