Received-SPF: pass (google.com: domain of linux-kernel+bounces-133950-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
From: Erick Archer <erick.archer@outlook.com>
To: Long Li <longli@microsoft.com>,
	Ajay Sharma <sharmaajay@microsoft.com>,
	"K. Y. Srinivasan" <kys@microsoft.com>,
	Haiyang Zhang <haiyangz@microsoft.com>,
	Wei Liu <wei.liu@kernel.org>,
	Dexuan Cui <decui@microsoft.com>,
	"David S. Miller" <davem@davemloft.net>,
	Eric Dumazet <edumazet@google.com>,
	Jakub Kicinski <kuba@kernel.org>,
	Paolo Abeni <pabeni@redhat.com>,
	Kees Cook <keescook@chromium.org>,
	"Gustavo A. R. Silva" <gustavoars@kernel.org>,
	Nathan Chancellor <nathan@kernel.org>,
	Nick Desaulniers <ndesaulniers@google.com>,
	Bill Wendling <morbo@google.com>,
	Justin Stitt <justinstitt@google.com>,
	Jason Gunthorpe <jgg@ziepe.ca>,
	Leon Romanovsky <leon@kernel.org>,
	Shradha Gupta <shradhagupta@linux.microsoft.com>,
	Konstantin Taranov <kotaranov@microsoft.com>
Cc: Erick Archer <erick.archer@outlook.com>,
	linux-rdma@vger.kernel.org,
	linux-hyperv@vger.kernel.org,
	netdev@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	linux-hardening@vger.kernel.org,
	llvm@lists.linux.dev
Subject: [PATCH v3 0/3] RDMA/mana_ib: Add flex array to struct mana_cfg_rx_steer_req_v2
Date: Sat,  6 Apr 2024 16:23:34 +0200
Message-ID:
 <AS8PR02MB72374BD1B23728F2E3C3B1A18B022@AS8PR02MB7237.eurprd02.prod.outlook.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: AS8PR02MB7237:EE_|AS8PR02MB6967:EE_
X-MS-Office365-Filtering-Correlation-Id: a57313b9-651b-42e7-2775-08dc56453095
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info:
	ut24Vp4o5AQM6Th+tP0RVh2XbmGVC9hqgHIXOxmrGVcbopHo0STJhJbo6zo2A9kpmm+wEdhO3c8v3FV9/Y/T69ezQzmosxGtYY/ueRZzuyjuUhO21a6qzFuc0rMDUSD2iBKbZC3rWjxUqkpOBM1dCjCz2z1JjxytJZoZ8hoPSOoiGwrdzicJuhjJoyaCS/dvxfnWCdnaxtM0AeQLod0959t33f2ikz0vzFNj9X1PGNqXKRRPZzVbj5G7DUblq7GR5P0HHtiqR5eSnwqdU46lhPzXLcdhQW0sxZhMWHeLlgOQvB2kBzkxIEYERE7SPX3Btq7iP4Uu2HtIk2ltJ9HnO7p/Xyww4OF6JNnE5wxtKBEGHhejgc0Yyxz5M/TzCq2lXtRa60FrnNItjrNWCu/i5Qv0YD2qVU3WVZ7uvzEzP2cvEdl04xeMuta7Gbedl9R5swaAYTEe2NHm8qkmba5IdIDGKsAwNw8sJabdAklPYAX1jnOGsyaFXuoTrReY0/LHMpOSzuYSTUPKXKCWqkwNRvzopSu0+AB17SOY6dVOFqVDMLla0EFnfxqxL1m3UqiCX9QeZXzUgmIaGU849aEj/MA3t0046gC5MSpf4jncgrUwXuTg+hKbaa1fATLr7BSgXAl+K4x2WH87LJTxmGMprC0RzvUSFHoRW8Ow5osxVVVuOZ5ghJvbEh2pYqFo2Q0IWt3SkFawoZcwA+7E1PZc7Q==
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?T4XFanc7FK1DSvOBD/bTTBZixWGmrdtxywfz8eMZvGXDZqt/k7qSLICoUXDU?=
 =?us-ascii?Q?7aLGGIjLDfGAUn4jfVbBx1tSE+U/P6pz6mRZFnu0QeW0dLHXwjeuwM+kBpX8?=
 =?us-ascii?Q?SC+WIbYApCpgzCuJBUyQkmiaDU25Z7qcwurgmp1cKgQ3adtMe4LqaMeXqztH?=
 =?us-ascii?Q?pV3ktqBjq92ghhn5iR3i+lrpdDUf0ss3r5sQHbF1IOHWgDFIQxtch8qKVA3A?=
 =?us-ascii?Q?1mFXMEcZu9kayUcl95ZEnsxkeH0Y2sgykuWXiTik90VApWcPwfMI08y1EVUU?=
 =?us-ascii?Q?qJkNneeE5NOYvw/u2eTJhieCafV3nKZgsp2psT2bwJDCjwGlE6CIu9vFTV9T?=
 =?us-ascii?Q?0u4dH9dvw8es+jZEfz6/8eDVCm5cPwOp5NbVHMpL9CyYa4elIYomHiyyTn2f?=
 =?us-ascii?Q?D6P89IJwIiysEETRaI2KypJCZ0w/2gTybQ0Q/ozwfzUcKXVlY3V1QaXUiLlR?=
 =?us-ascii?Q?OUk9QBxC49oTV4ulU0JMQxZck9Ii+8dExsn1kKM899fAMiPOlB9QIwBlHOks?=
 =?us-ascii?Q?PkwwIlgE9Nbb3tUO0J4y3zjPpUDqo2KAPVGU3bQNGdilWBVyKequoTrpBCx4?=
 =?us-ascii?Q?bfzTPI4+0ne7spfV8ZlIdIrh+32U/soA0nDbbOAPU9e3FVa7gD4dXtoz39ox?=
 =?us-ascii?Q?xBw4xWPa5sJVHneew9gi7rheERKKUx6KcamXIMoJpNW+chfoY2IuprU0pjRN?=
 =?us-ascii?Q?OQOZ3514tePmiryJISOkeyJAkcV2kGjMF0wFlW2tFNotdK608LUTWg1iWBcH?=
 =?us-ascii?Q?F2jAvhlcuArUT/4dMo781soOB0pgZi37N7TZctbnjClZu82xGeYYD6Qk1rkK?=
 =?us-ascii?Q?LlzTHpQNBqy4dyJQpd7bJLYln4+xxC5XlfgsK0U/XsnOiZA8Tqdg/G2hr269?=
 =?us-ascii?Q?z1y+sWgXxpDyuPf4BMS5OYYPaxfTRMKSNcvt46USx2PTV8N2y6HHigjqxe5s?=
 =?us-ascii?Q?7Yhw0CkzCbGWtgUNMXn2RAEw6WHiiVyEqz6jXEHHKCUA/8TubDjsQUBXubcE?=
 =?us-ascii?Q?fo61OgOBab84Kvu/FatqypN+H7SL3nMcqmhb/zO3eds+ED52rvwov0dT0fwp?=
 =?us-ascii?Q?GkZEbWtKUqYxCLZUw2ELes2k4UWvI4qPdxGuX4vAKc0NwUHfeeWdc4hOZdS/?=
 =?us-ascii?Q?LSXfWtCsD86wEo50YPB/uXBh7ZUonmzm0obJyWQOQ0fz2IwPgqXvjYzO9b9d?=
 =?us-ascii?Q?oNeDqJT1hMBfdeCStzZ3Rx4XdYXM1AbEzupChxRESoVqo1V4W8uI/L7X4nwL?=
 =?us-ascii?Q?++BIv9JWXE9UadALUXpF?=
X-OriginatorOrg: outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: a57313b9-651b-42e7-2775-08dc56453095
X-MS-Exchange-CrossTenant-AuthSource: AS8PR02MB7237.eurprd02.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Apr 2024 14:23:57.7266
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa
X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg:
	00000000-0000-0000-0000-000000000000
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR02MB6967

The "struct mana_cfg_rx_steer_req_v2" uses a dynamically sized set of
trailing elements. Specifically, it uses a "mana_handle_t" array. So,
use the preferred way in the kernel declaring a flexible array [1].

At the same time, prepare for the coming implementation by GCC and Clang
of the __counted_by attribute. Flexible array members annotated with
__counted_by can have their accesses bounds-checked at run-time via
CONFIG_UBSAN_BOUNDS (for array indexing) and CONFIG_FORTIFY_SOURCE (for
strcpy/memcpy-family functions).

Also, avoid the open-coded arithmetic in the memory allocator functions
[2] using the "struct_size" macro.

Moreover, use the "offsetof" helper to get the indirect table offset
instead of the "sizeof" operator and avoid the open-coded arithmetic in
pointers using the new flex member. This new structure member also allow
us to remove the "req_indir_tab" variable since it is no longer needed.

Now, it is also possible to use the "flex_array_size" helper to compute
the size of these trailing elements in the "memcpy" function.

Specifically, the first commit adds the flex member and the patches 2 and
3 refactor the consumers of the "struct mana_cfg_rx_steer_req_v2".

This code was detected with the help of Coccinelle, and audited and
modified manually. The Coccinelle script used to detect this code pattern
is the following:

virtual report

@rule1@
type t1;
type t2;
identifier i0;
identifier i1;
identifier i2;
identifier ALLOC =~ "kmalloc|kzalloc|kmalloc_node|kzalloc_node|vmalloc|vzalloc|kvmalloc|kvzalloc";
position p1;
@@

i0 = sizeof(t1) + sizeof(t2) * i1;
..
i2 = ALLOC@p1(..., i0, ...);

@script:python depends on report@
p1 << rule1.p1;
@@

msg = "WARNING: verify allocation on line %s" % (p1[0].line)
coccilib.report.print_report(p1[0],msg)

Link: https://www.kernel.org/doc/html/next/process/deprecated.html#zero-length-and-one-element-arrays [1]
Link: https://www.kernel.org/doc/html/next/process/deprecated.html#open-coded-arithmetic-in-allocator-arguments [2]
Signed-off-by: Erick Archer <erick.archer@outlook.com>
---
Changes in v3:
- Split the changes in various commits to simplify the acceptance process
  (Leon Romanovsky).

Changes in v2:
- Remove the "req_indir_tab" variable (Gustavo A. R. Silva).
- Update the commit message.
- Add the "__counted_by" attribute.

Previous versions:
v1 -> https://lore.kernel.org/linux-hardening/AS8PR02MB7237974EF1B9BAFA618166C38B382@AS8PR02MB7237.eurprd02.prod.outlook.com/
v2 -> https://lore.kernel.org/linux-hardening/AS8PR02MB723729C5A63F24C312FC9CD18B3F2@AS8PR02MB7237.eurprd02.prod.outlook.com/
---
Erick Archer (3):
  net: mana: Add flex array to struct mana_cfg_rx_steer_req_v2
  RDMA/mana_ib: Prefer struct_size over open coded arithmetic
  net: mana: Avoid open coded arithmetic

 drivers/infiniband/hw/mana/qp.c               | 12 +++++-------
 drivers/net/ethernet/microsoft/mana/mana_en.c | 14 ++++++--------
 include/net/mana/mana.h                       |  1 +
 3 files changed, 12 insertions(+), 15 deletions(-)

-- 
2.25.1