* [PATCH v2] scsi: fcoe: Statically initialize flogi_maddr
@ 2021-06-02 18:00 Kees Cook
2021-06-02 18:41 ` Gustavo A. R. Silva
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Kees Cook @ 2021-06-02 18:00 UTC (permalink / raw)
To: Martin K. Petersen
Cc: Kees Cook, Joe Perches, Hannes Reinecke, James E.J. Bottomley,
Gustavo A. R. Silva, linux-scsi, linux-hardening, linux-kernel
In preparation for FORTIFY_SOURCE performing compile-time and run-time
field bounds checking for memcpy() avoid using an inline const buffer
argument and instead just statically initialize the destination array
directly.
Signed-off-by: Kees Cook <keescook@chromium.org>
---
v2:
- use "static const" (Joe)
v1: https://lore.kernel.org/lkml/20210528181337.792268-2-keescook@chromium.org/
---
drivers/scsi/fcoe/fcoe.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c
index 89ec735929c3..5ae6c207d3ac 100644
--- a/drivers/scsi/fcoe/fcoe.c
+++ b/drivers/scsi/fcoe/fcoe.c
@@ -293,7 +293,7 @@ static int fcoe_interface_setup(struct fcoe_interface *fcoe,
struct fcoe_ctlr *fip = fcoe_to_ctlr(fcoe);
struct netdev_hw_addr *ha;
struct net_device *real_dev;
- u8 flogi_maddr[ETH_ALEN];
+ static const u8 flogi_maddr[ETH_ALEN] = FC_FCOE_FLOGI_MAC;
const struct net_device_ops *ops;
fcoe->netdev = netdev;
@@ -336,7 +336,6 @@ static int fcoe_interface_setup(struct fcoe_interface *fcoe,
* or enter promiscuous mode if not capable of listening
* for multiple unicast MACs.
*/
- memcpy(flogi_maddr, (u8[6]) FC_FCOE_FLOGI_MAC, ETH_ALEN);
dev_uc_add(netdev, flogi_maddr);
if (fip->spma)
dev_uc_add(netdev, fip->ctl_src_addr);
@@ -442,7 +441,7 @@ static void fcoe_interface_remove(struct fcoe_interface *fcoe)
{
struct net_device *netdev = fcoe->netdev;
struct fcoe_ctlr *fip = fcoe_to_ctlr(fcoe);
- u8 flogi_maddr[ETH_ALEN];
+ static const u8 flogi_maddr[ETH_ALEN] = FC_FCOE_FLOGI_MAC;
const struct net_device_ops *ops;
/*
@@ -458,7 +457,6 @@ static void fcoe_interface_remove(struct fcoe_interface *fcoe)
synchronize_net();
/* Delete secondary MAC addresses */
- memcpy(flogi_maddr, (u8[6]) FC_FCOE_FLOGI_MAC, ETH_ALEN);
dev_uc_del(netdev, flogi_maddr);
if (fip->spma)
dev_uc_del(netdev, fip->ctl_src_addr);
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH v2] scsi: fcoe: Statically initialize flogi_maddr
2021-06-02 18:00 [PATCH v2] scsi: fcoe: Statically initialize flogi_maddr Kees Cook
@ 2021-06-02 18:41 ` Gustavo A. R. Silva
2021-06-08 1:30 ` Martin K. Petersen
2021-06-16 3:49 ` Martin K. Petersen
2 siblings, 0 replies; 4+ messages in thread
From: Gustavo A. R. Silva @ 2021-06-02 18:41 UTC (permalink / raw)
To: Kees Cook, Martin K. Petersen
Cc: Joe Perches, Hannes Reinecke, James E.J. Bottomley,
Gustavo A. R. Silva, linux-scsi, linux-hardening, linux-kernel
On 6/2/21 13:00, Kees Cook wrote:
> In preparation for FORTIFY_SOURCE performing compile-time and run-time
> field bounds checking for memcpy() avoid using an inline const buffer
> argument and instead just statically initialize the destination array
> directly.
>
> Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Thanks
--
Gustavo
> ---
> v2:
> - use "static const" (Joe)
> v1: https://lore.kernel.org/lkml/20210528181337.792268-2-keescook@chromium.org/
> ---
> drivers/scsi/fcoe/fcoe.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c
> index 89ec735929c3..5ae6c207d3ac 100644
> --- a/drivers/scsi/fcoe/fcoe.c
> +++ b/drivers/scsi/fcoe/fcoe.c
> @@ -293,7 +293,7 @@ static int fcoe_interface_setup(struct fcoe_interface *fcoe,
> struct fcoe_ctlr *fip = fcoe_to_ctlr(fcoe);
> struct netdev_hw_addr *ha;
> struct net_device *real_dev;
> - u8 flogi_maddr[ETH_ALEN];
> + static const u8 flogi_maddr[ETH_ALEN] = FC_FCOE_FLOGI_MAC;
> const struct net_device_ops *ops;
>
> fcoe->netdev = netdev;
> @@ -336,7 +336,6 @@ static int fcoe_interface_setup(struct fcoe_interface *fcoe,
> * or enter promiscuous mode if not capable of listening
> * for multiple unicast MACs.
> */
> - memcpy(flogi_maddr, (u8[6]) FC_FCOE_FLOGI_MAC, ETH_ALEN);
> dev_uc_add(netdev, flogi_maddr);
> if (fip->spma)
> dev_uc_add(netdev, fip->ctl_src_addr);
> @@ -442,7 +441,7 @@ static void fcoe_interface_remove(struct fcoe_interface *fcoe)
> {
> struct net_device *netdev = fcoe->netdev;
> struct fcoe_ctlr *fip = fcoe_to_ctlr(fcoe);
> - u8 flogi_maddr[ETH_ALEN];
> + static const u8 flogi_maddr[ETH_ALEN] = FC_FCOE_FLOGI_MAC;
> const struct net_device_ops *ops;
>
> /*
> @@ -458,7 +457,6 @@ static void fcoe_interface_remove(struct fcoe_interface *fcoe)
> synchronize_net();
>
> /* Delete secondary MAC addresses */
> - memcpy(flogi_maddr, (u8[6]) FC_FCOE_FLOGI_MAC, ETH_ALEN);
> dev_uc_del(netdev, flogi_maddr);
> if (fip->spma)
> dev_uc_del(netdev, fip->ctl_src_addr);
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v2] scsi: fcoe: Statically initialize flogi_maddr
2021-06-02 18:00 [PATCH v2] scsi: fcoe: Statically initialize flogi_maddr Kees Cook
2021-06-02 18:41 ` Gustavo A. R. Silva
@ 2021-06-08 1:30 ` Martin K. Petersen
2021-06-16 3:49 ` Martin K. Petersen
2 siblings, 0 replies; 4+ messages in thread
From: Martin K. Petersen @ 2021-06-08 1:30 UTC (permalink / raw)
To: Kees Cook
Cc: Martin K. Petersen, Joe Perches, Hannes Reinecke,
James E.J. Bottomley, Gustavo A. R. Silva, linux-scsi,
linux-hardening, linux-kernel
Kees,
> In preparation for FORTIFY_SOURCE performing compile-time and run-time
> field bounds checking for memcpy() avoid using an inline const buffer
> argument and instead just statically initialize the destination array
> directly.
Applied to 5.14/scsi-staging, thanks!
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] scsi: fcoe: Statically initialize flogi_maddr
2021-06-02 18:00 [PATCH v2] scsi: fcoe: Statically initialize flogi_maddr Kees Cook
2021-06-02 18:41 ` Gustavo A. R. Silva
2021-06-08 1:30 ` Martin K. Petersen
@ 2021-06-16 3:49 ` Martin K. Petersen
2 siblings, 0 replies; 4+ messages in thread
From: Martin K. Petersen @ 2021-06-16 3:49 UTC (permalink / raw)
To: Kees Cook
Cc: Martin K . Petersen, James E.J. Bottomley, Joe Perches,
linux-kernel, Hannes Reinecke, linux-hardening, linux-scsi,
Gustavo A. R. Silva
On Wed, 2 Jun 2021 11:00:00 -0700, Kees Cook wrote:
> In preparation for FORTIFY_SOURCE performing compile-time and run-time
> field bounds checking for memcpy() avoid using an inline const buffer
> argument and instead just statically initialize the destination array
> directly.
Applied to 5.14/scsi-queue, thanks!
[1/1] scsi: fcoe: Statically initialize flogi_maddr
https://git.kernel.org/mkp/scsi/c/ebab8e09a07f
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-06-16 3:50 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-02 18:00 [PATCH v2] scsi: fcoe: Statically initialize flogi_maddr Kees Cook
2021-06-02 18:41 ` Gustavo A. R. Silva
2021-06-08 1:30 ` Martin K. Petersen
2021-06-16 3:49 ` Martin K. Petersen
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.