From nobody Tue Dec 16 11:13:08 2025 Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2701B44C77; Mon, 14 Apr 2025 13:24:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744637077; cv=none; b=aRmp+VRN9AQE7i9psUlIxO13W+W5t6OfNDTvQ4C9VOS+J0wjP0SEvSYBHbZtlKGHK/hOXT8aujnqrWLmBVbR0F4fOahK6Dud71xMf+xDSTNFsJafiNo94GJBloOnAg2FvYxLouu+BeLHtvUYY9noW5VAVjgF5vwq7fxuIHp/zKw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744637077; c=relaxed/simple; bh=GlsQ08MjyrgSqf/SRiJCowC1n8P7DiY9zTVTUCcQ7OA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=czm6QwN56W6NT83AygjnExiH2ffHWa4jn2kpZUb8uSC1N9MkTMniZeZtLZnNkEhWJcQhqS94pAGxzdBFfkzAZCadfXKa2k6CleUTyXLc3o3/c2mRdR42/UGWug3jIWAk+G8lnx9NAumwHOKAPWhhqxbR8dRYLVnJkVK4ZkOpK64= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.208.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ed1-f46.google.com with SMTP id 4fb4d7f45d1cf-5e66407963fso7988034a12.2; Mon, 14 Apr 2025 06:24:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744637074; x=1745241874; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OcR0RCAc7YT2S7CQ5NvY2gzccevK7QUJbHLGjpEDSXg=; b=q+mMbIBuZhMHygGLzKdbFuNkR3sf+sg9Rn+0EcSknFnnIrOvhyRVP52daddmoy2lga jLnLoWoJrvzRvQUs3QwpHkPPv2lFrogWSkCQ0nNMPQ2M4NdWLmO0ZoKTjTBy5s+FykvE U9q2TmmpiWpjBR2vbuv2jX/kS+kJ2mvRyCbTWWu0RBjzegFSASb3dRn1ShT9nf6w6VyP Zc+pEw+rFWnvGHFHUn0rq7wKepe8+Ce/l/LjXoVDrhrWWZlMLU0ujgEgwRE0eR8BNQ5F pOv8NYMDKDsF7HVH7jvE1SbjPqHjCbOcynPsqIUZ3zOQM51XOpkO1xF1QkSHkbcJOhLq 2Cag== X-Forwarded-Encrypted: i=1; AJvYcCX5Smkp7K5UQfounCbHEgMfYOk6Su0VREYDFX8j08YWOMy4Y+hV25NCPiwQwrrq4Qat8+XYS1RXQ2KEEYE=@vger.kernel.org X-Gm-Message-State: AOJu0Yyd59yYuEm1QF4Ypk911nUEjXaJJ+dUTp9kiPj7Dej68AZu1qNo WUjpBZuMVRhSMLwPeGt3H4VWANRGKuZ3K38+Xrihkgf4kIJaBsGa X-Gm-Gg: ASbGncupwP89ddohdT0WUYQe4DrtmmanUV0XZ+VhP1EiBTOBCD5jNrfvAc6GWXOKjIL Hpj+4apXBST0nA9f7lFaVXOVrn2gK/M3dLrs1SCZjfLg00Hd+Gk8zQyH2Uo00U69zfCAfuI10eP d5NvCErn3/8LsU3JptoJ3dXrULXzJJGtBEjjCtjsNGxHfsy+FejMmXHw5iKBQ1iXGNWRprVmozu VtM9MFuRappKmQCghg/CuHg3uuKm7k1JBk9knvsEFzorf1HHlYraERtMZPPvvmIcS+cgZkRYBaj cHKAQzI9FTts7HGepvG/FEYjfTfmcM4= X-Google-Smtp-Source: AGHT+IGItMyl2cFM3/ZGsCN38SGLo+ErsqtMk/g7pmcDfzf9ilR7VrMcVg7cu6EOYYRCQvx0wgg/2g== X-Received: by 2002:a17:907:970a:b0:ac7:4d45:f13e with SMTP id a640c23a62f3a-acad3494137mr1040869866b.13.1744637074018; Mon, 14 Apr 2025 06:24:34 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:3::]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-acaa1c011e3sm906501766b.77.2025.04.14.06.24.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Apr 2025 06:24:33 -0700 (PDT) From: Breno Leitao Date: Mon, 14 Apr 2025 06:24:07 -0700 Subject: [PATCH net-next v2 01/10] netlink: Introduce nlmsg_payload helper Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250414-nlmsg-v2-1-3d90cb42c6af@debian.org> References: <20250414-nlmsg-v2-0-3d90cb42c6af@debian.org> In-Reply-To: <20250414-nlmsg-v2-0-3d90cb42c6af@debian.org> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , David Ahern Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Breno Leitao , kernel-team@meta.com, Kuniyuki Iwashima X-Mailer: b4 0.15-dev-42535 X-Developer-Signature: v=1; a=openpgp-sha256; l=1311; i=leitao@debian.org; h=from:subject:message-id; bh=GlsQ08MjyrgSqf/SRiJCowC1n8P7DiY9zTVTUCcQ7OA=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBn/QyOVbB5AF6sfof3uVb4xIl2UqdPpRy7+h8z7 Bm9kU4/UKqJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCZ/0MjgAKCRA1o5Of/Hh3 bfylD/9CJYDoBZPrquwuHCtYY0psAPoagt3VGUdnt8Rb1SYc/LCOTxEoXuLxqi5w5cIs2wpSz8H +NQPeqDccqi3tbUhfKMx/kTsnCbwZxxEmlHNAey5Gt17HPqGtmRY8H4l+XQCqfX3GRd4VhpWFE2 mrdSd7W7sQ+nmBGyGrcU/e/9m+ekFRShOpOKR4DPdp2cwstIv1A3zyIoY+Vsz5m7m9GXKnhX3Ay OomvlkMQY/rALRqkW5L5LWZf84yLux2vv/PNqpZt2Fa+yGwZDyB9PBAWVsWJ69stMIFQItE9Jjo AendNBpIOZXd5nH+lXTlIxEknJ7EVTV8YjcO1Ahmz55GqyE8hGA1NdWKCeeL4CP6laKyDYgLggW 8bm0S6I9+L+2FyDihgsc5t3nlqOCCQm5UFjo2zfKMkAHGK1XAu7EjtaAaISjH5z8wHcSrMCkjhO Wz1s9JMsyq/UOkGIW+79dT68mcPFpcZBUteqmhzeDegVOZy0oDnE0FTBvFz8kjVpSjKKCBJ0+PB fDaDr9DV3MD9KBKw4AjCsm8UDE8hOht0UJez2eIZWtka6wpPUz1yDXuPYfjreoHtUlpniYliqg1 9Fdp1Lc4dvxkynVQBtp+5ADLqcR4Ioi2Z2qmwPyURacvgbVKpv5pGAaW9x3jtDniyH7C61PwkNs X4eImtIwcTybSLw== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D Create a new helper function, nlmsg_payload(), to simplify checking and retrieving Netlink message payloads. This reduces boilerplate code for users who need to verify the message length before accessing its data. Suggested-by: Jakub Kicinski Signed-off-by: Breno Leitao Reviewed-by: Jakub Kicinski Reviewed-by: Kuniyuki Iwashima --- include/net/netlink.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/include/net/netlink.h b/include/net/netlink.h index 29e0db9403820..82e07e272290a 100644 --- a/include/net/netlink.h +++ b/include/net/netlink.h @@ -611,6 +611,22 @@ static inline int nlmsg_len(const struct nlmsghdr *nlh) return nlh->nlmsg_len - NLMSG_HDRLEN; } =20 +/** + * nlmsg_payload - message payload if the data fits in the len + * @nlh: netlink message header + * @len: struct length + * + * Returns: The netlink message payload/data if the length is sufficient, + * otherwise NULL. + */ +static inline void *nlmsg_payload(const struct nlmsghdr *nlh, size_t len) +{ + if (nlh->nlmsg_len < nlmsg_msg_size(len)) + return NULL; + + return nlmsg_data(nlh); +} + /** * nlmsg_attrdata - head of attributes data * @nlh: netlink message header --=20 2.47.1 From nobody Tue Dec 16 11:13:08 2025 Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 765934C79; Mon, 14 Apr 2025 13:24:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744637079; cv=none; b=Hd8sMbp9TICjM8KocD8TL9SaJkPwBH2nttWnRkvKu53WmjX1bpCtiujKX/BucErJkbyZ4xdfudF5rFcHX4ZMtaL3R5OWUwU5s0owjzcIVL3ssZBLXjPH+2S6/+bBRbF9+4RMx//VdYdEiuy6b8/w5LJlp/Qh3VDox/8usr29qnM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744637079; c=relaxed/simple; bh=Ibw2sNu8KeGqKxrgWmVE8Rau1AKfR0gUOro3uD9Z5Qw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=eclFmbIgIFrA3bLzPHnPk5X4LH/vX0NsfNrPp7Qy76/96fz+k5cjbqgoyZUhF/KP4vsOW2BRisQZtEj+jdo//v/jldKFhSIIUa2c06bxr5r9hK0kaH3Qu5ES4FWLWrP+4+3WxdVCRDoWqH76AN4lk+cQBC1Mb78hsUe3QbUpGOo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.218.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ej1-f50.google.com with SMTP id a640c23a62f3a-ac297cbe017so968894566b.0; Mon, 14 Apr 2025 06:24:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744637076; x=1745241876; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pWuoOm/EAh8A+OC10WY2olZnlBorl56UzaOtac9WN7s=; b=MhiX6TKJMfj8oFki0C03uiB9oX0YXPkRSzfBQrpVyo4Jshf6OhraImVr6Cq8xLXqnY oSdFqYi78egaM/cSeB+lXCIeLkeFOVipDM0RaVoMo7NGHF5i1+IMxiEdibXz84Iiik7a XuBFhfDpzJKlfNnlxyWdwRqCS4cmYg8wGXqoNH3FlSZ7CkeKKPSkSFKGz4QKiA/09dEQ k5CCkby0X4WUZ3nXRnzSR5R50/ebCC5qYq6VlYanuMWxNMJmbXexokXRAOSkx4vhQEXW +nF8/28HKtmNsGqW9OwFyp5fgdEceSBZjCh2wZXmXuYWCigiCKEslt+nxXCYxrUXK2m7 pIsw== X-Forwarded-Encrypted: i=1; AJvYcCUfrqoJOScgfqJIAJ7ybJApGBq4UcYTkXIfdsyyFWTbNK5hOrS1Isq3acj1NPYty0TrD16vSU/p2vAkjaw=@vger.kernel.org X-Gm-Message-State: AOJu0Yxd3mkls9Kv4qBCNlQmasF3mZrGuxLFNbj4NTn9AQ0gNqGwOt1u 1oOlTqKEwHg7q00+M/uN29rg5Lc8cJcIQvnvpnsgS+b4x3EgL+lR X-Gm-Gg: ASbGnctyw22AUB3kM9GdaYg8c9nMIyz7FK6tq2g03E+09o7TtUTwSxPlHGxuyWfid6w Jnp8dHL/zF21IFxUEIFfMxUuCaSebAPGoLJhPAwp6ofxz4cg77cl6o6kPFjrSIzRSiOETBdIab9 bxkMJqLB0LoD3h83uRONJxJpKmZHWabUdvVFMJXUX8WpAQwpyzmTQDozmr/HriVadTqAXpAp1iE 9nHqlosiu6MofWxhlWz+b4Dmxt5Oo/t0nyUfq+3rtBw3sDYw2qAOIEaL/IupU1+d8fBabC2IJc1 lHeisqtAKtBxHIsx0eUwlZBY8gG2PtJInwf53Grbkw== X-Google-Smtp-Source: AGHT+IHaajRl7Psebw7s9XiK31rDuCP8yx+8XPtmRqMfcB5BUfO/s+1mXS7JLMHm7FnjEvegKnYOIg== X-Received: by 2002:a17:906:dc8d:b0:ac7:2fbb:ba5 with SMTP id a640c23a62f3a-acabbeeaf57mr1475064066b.7.1744637075401; Mon, 14 Apr 2025 06:24:35 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:7::]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-acaa1cb405asm913707066b.100.2025.04.14.06.24.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Apr 2025 06:24:34 -0700 (PDT) From: Breno Leitao Date: Mon, 14 Apr 2025 06:24:08 -0700 Subject: [PATCH net-next v2 02/10] neighbour: Use nlmsg_payload in neightbl_valid_dump_info Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250414-nlmsg-v2-2-3d90cb42c6af@debian.org> References: <20250414-nlmsg-v2-0-3d90cb42c6af@debian.org> In-Reply-To: <20250414-nlmsg-v2-0-3d90cb42c6af@debian.org> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , David Ahern Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Breno Leitao , kernel-team@meta.com, Kuniyuki Iwashima X-Mailer: b4 0.15-dev-42535 X-Developer-Signature: v=1; a=openpgp-sha256; l=1127; i=leitao@debian.org; h=from:subject:message-id; bh=Ibw2sNu8KeGqKxrgWmVE8Rau1AKfR0gUOro3uD9Z5Qw=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBn/QyOvDGJIIMYdrknaaOU3B1F0iNW/0GKPwmRS YxoX04fNi2JAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCZ/0MjgAKCRA1o5Of/Hh3 bdUJEACAoYUqm7E8UsctBqslzseNIta3ZVWDlJ24aeV2DlvV8okIW5OIYYK19joObzd2DOlPJFe 4964OXUHpScToYtpx9njIRHaE9Mbdbze2ntmt+m7mVJu8LymRhabtUm6uwyf70XIs3gfIl6SCso bTMN9Xlq94RypBZDB4NmjTGOzSVQYDwnq32ITSOMmv8e0gEdOVq36mUUDvE7qTCiPCEh/jhpgFW gebbmg85324hHX6aTCCyF/b1sWT53QIwQmQCd3O3uWZhwR8FhNQHbufvqO6qV8U2wqHrXDopIoT fYHE5qBQ7aMZe0IYS/pi1dfhC+NNXBU1nRUdVynBXnO9yhrm74DcTLT0UrH9mw0SbxuoMeE81VK qQUqPFCi86Wz0STNdLrMpy0HPNXGOWdqyGWLV4kk+WxzYMNXFe7vSCs8EjXq7WspmNuyMZqhqzL 8QfzkGXzJCTtNd3//7v74BeljkkfxB7KkTd784OUgGukbU3MgJgL9Q65FaKnEUo9pxmPh/8mVck kAtmnYtaKpX2RWoBTtatPTl2WIaI43y6BvV6SAkf4PzChGz8xyooclWJoywea2wJXtzPD9/zAoS lnvRnSMXhWxa0aqbr34CZmzoVzAJgAHNEIC97ZPOgWWIy1lTkvjBtpYx+zTPgY6lSja3GsbIh4Q kLRQu43NxGhBIDw== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D Update neightbl_valid_dump_info function to utilize the new nlmsg_payload() helper function. This change improves code clarity and safety by ensuring that the Netlink message payload is properly validated before accessing its data. Signed-off-by: Breno Leitao Reviewed-by: Kuniyuki Iwashima --- net/core/neighbour.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/core/neighbour.c b/net/core/neighbour.c index a07249b59ae1e..b6bc4836c6e45 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c @@ -2430,12 +2430,12 @@ static int neightbl_valid_dump_info(const struct nl= msghdr *nlh, { struct ndtmsg *ndtm; =20 - if (nlh->nlmsg_len < nlmsg_msg_size(sizeof(*ndtm))) { + ndtm =3D nlmsg_payload(nlh, sizeof(*ndtm)); + if (!ndtm) { NL_SET_ERR_MSG(extack, "Invalid header for neighbor table dump request"); return -EINVAL; } =20 - ndtm =3D nlmsg_data(nlh); if (ndtm->ndtm_pad1 || ndtm->ndtm_pad2) { NL_SET_ERR_MSG(extack, "Invalid values in header for neighbor table dump= request"); return -EINVAL; --=20 2.47.1 From nobody Tue Dec 16 11:13:08 2025 Received: from mail-ed1-f51.google.com (mail-ed1-f51.google.com [209.85.208.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C8A8D2D3A89; Mon, 14 Apr 2025 13:24:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744637080; cv=none; b=EvVfAgj0CaHvf5LnFlsMU7rQTsFkg5CpaFxYTIDp2D7Su8XGRQG+u+LiRDidNFpNaNMcXCU5o7nnp3JKI5iJYSIlg99nR/iV0XTKY/7T58/lzN/DhdXmdUMxyVIQc7G4dDBU4r6ZOGtjyj9/vPX2azCkMpJUYx8OSmOS32D5Jcs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744637080; c=relaxed/simple; bh=TX7KDRkVxewIVmRSQKXdXwWZB0Nhk8FMev/2a3gTxws=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=IrG0k3CFHtUUeAEL+TvKVUzx0e4pclmUIV2MqQHTOxxExyUEPqx6jATzNuEfvGuIQmy+S26lp0X7j7h1XshlrHrg2/vg8ccYFftDOKd7ITK2fRuJmn7fmRcsWx1yIAKbCc4i48NQrDdGwjPPkTN/mRAXHa9hqSgO2A863rbmC9I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.208.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ed1-f51.google.com with SMTP id 4fb4d7f45d1cf-5e61375c108so5428092a12.1; Mon, 14 Apr 2025 06:24:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744637077; x=1745241877; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=R2sWzig08utwsn26aQcHYW8fjy2ABURqiBL3C70ruNQ=; b=aJAv/kIU8bBQWQ/pIwE6DW4JLzukh2j3B7UbgEmfKfuWivZgTfs2Mgxti+zkRmzCrv MJNGkwB22fDygrwRZ1o+KSFXssorlfHyqiCDCeCyIwyT4hpn0JcLMDqUQ3VYvZWCl2dz 9ToKfPzZX5I1G4u1Q7LcUWqKWqwS48zbwX61gCImWu3pm/v88BrpEPEHEr9UB1hZ2wNM 3VP3w3w1XL4cbIb9uIGfb49uDGwVwCvs5Mltkt7o1Lr4B1nSld/nHtGXUd0hZeTEBI0+ P2hozUK4MP1+k+3WgyeQloryGoPxbQnQbKeaCy1VJOa+7VoTuML87x1/cuVpaBtvOT3w xeCg== X-Forwarded-Encrypted: i=1; AJvYcCWbLVBFjkEhwi5lISsrUSp6VcIiDUsUUA60MiPH2PfveC38HHf3Wx/2yYbvx45grexuc723tFeoodxXWHE=@vger.kernel.org X-Gm-Message-State: AOJu0YyAbVxdEOJxCQUvXhYkA16wbvzi7Aoq0QuyPYzWmVEIWoMR8Nmx mJMMjcEpF7pKdNHYdPMykR+UmCx+CUBJvdaLnO9iJ2WldwrjLRIR X-Gm-Gg: ASbGncuW5cvK7JirYbRvfxLQ+YpWuQChPCMt8ifZcTGaIGKZF27ABKbTJ6Qb4R7uYRt mgbcCFSPixNk/uX+x2DOWe4vpXL4aP1A31XAk4Hn8LQJcioUFE0OT+1N/rGlrnf2sMmR2DN1Gd3 PsfWMaBuGhxQLHPKn6ymka6+hGHnZC6TxY5+GkJqM9yBCakQMKSpe4EUWxbVO3uL6+f6FehNqMC OiNp94VlB73LdvEeGZyTwbMYegdyk2ZPt/NFCy1QW0CTmqraG82DLvh5iiqRhTFe2wfd/vXZrhu 0UUDmEzPBcxlF2LRs+oImvyz1RGO X-Google-Smtp-Source: AGHT+IGayCfd7esSqxLjFxexLjeAZSACSTm9GIsU6rCH58RfPDmJvwYat2pABe+Zqn7hMIrzoq7HYg== X-Received: by 2002:a05:6402:26d1:b0:5dc:c9ce:b01b with SMTP id 4fb4d7f45d1cf-5f36f52de35mr9516346a12.8.1744637076871; Mon, 14 Apr 2025 06:24:36 -0700 (PDT) Received: from localhost ([2a03:2880:30ff::]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5f36ef56ea4sm5123138a12.25.2025.04.14.06.24.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Apr 2025 06:24:36 -0700 (PDT) From: Breno Leitao Date: Mon, 14 Apr 2025 06:24:09 -0700 Subject: [PATCH net-next v2 03/10] neighbour: Use nlmsg_payload in neigh_valid_get_req Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250414-nlmsg-v2-3-3d90cb42c6af@debian.org> References: <20250414-nlmsg-v2-0-3d90cb42c6af@debian.org> In-Reply-To: <20250414-nlmsg-v2-0-3d90cb42c6af@debian.org> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , David Ahern Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Breno Leitao , kernel-team@meta.com, Kuniyuki Iwashima X-Mailer: b4 0.15-dev-42535 X-Developer-Signature: v=1; a=openpgp-sha256; l=1126; i=leitao@debian.org; h=from:subject:message-id; bh=TX7KDRkVxewIVmRSQKXdXwWZB0Nhk8FMev/2a3gTxws=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBn/QyO79OcSPPTRnbvLnOkpQwtcIpuiQhVXwnQr vLEjorViN+JAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCZ/0MjgAKCRA1o5Of/Hh3 bS7nD/44y7kDeKz9ZYSBfzIITy8RyOzbyFIsy9/gsx7FUMbx1omMKhIVbqpnkZ/pDFvq3oPMyYj 6o1vFrmhzIPJ8Bw6ndWm4rRO647+c2eq8yhlwPspOev8jkYzqGCaUg1G7CLxTRANTNzCmwEq9CJ V8E0kOIHDb5jtZJSFuw45XJKKDT/wRd4jb5PufdrUOTT9inBGvpMb6NeZNNf3j8G8O9+iBffpGm NHrfuyAOZgzYwbj8Th56kKHN5vREpcpbCMIt0/akV9MHxfw2tD/CgrzQmqbBxRLVBv+NQ1zxKMd 7H+VGgji2CO8R6gHLlVbqh+afcm26rWbcfq0/UhdPvPzFE9XeQSYBiRU6PETAGYP8CAlonChcRT Rul+5ijZ2zE7qkFRo/bJnw5hmquJKupbp/d+BwbisgZddtrzYJJD7bXKrf2TVefs7bRHIpF0kBp ygCowd8GyYLkKISRBa5zcf3f83fTLZuIpnGYlRw4wu9A4Sd7V0yNtJZjFfO4Hiq4nM9cMcyTL0P Omm88CRqdGOnfjIQJilo6rY1Zz6M6JQ2ZREp1tFxJNl8mMq1uAMvy+5Q7MCuPOYL8hxBgOQvAoa dn3etIeE+8ELqcKxjfo+MlNVeST89LpVehwt1EuOKQ2KITSOV4oIRyBLPK6qbT6zmrIvCBC/gAw W2H2CYJMs999nvA== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D Update neigh_valid_get_req function to utilize the new nlmsg_payload() helper function. This change improves code clarity and safety by ensuring that the Netlink message payload is properly validated before accessing its data. Signed-off-by: Breno Leitao Reviewed-by: Kuniyuki Iwashima --- net/core/neighbour.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/core/neighbour.c b/net/core/neighbour.c index b6bc4836c6e45..65cf582b5dacd 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c @@ -2855,12 +2855,12 @@ static int neigh_valid_get_req(const struct nlmsghd= r *nlh, struct ndmsg *ndm; int err, i; =20 - if (nlh->nlmsg_len < nlmsg_msg_size(sizeof(*ndm))) { + ndm =3D nlmsg_payload(nlh, sizeof(*ndm)); + if (!ndm) { NL_SET_ERR_MSG(extack, "Invalid header for neighbor get request"); return -EINVAL; } =20 - ndm =3D nlmsg_data(nlh); if (ndm->ndm_pad1 || ndm->ndm_pad2 || ndm->ndm_state || ndm->ndm_type) { NL_SET_ERR_MSG(extack, "Invalid values in header for neighbor get reques= t"); --=20 2.47.1 From nobody Tue Dec 16 11:13:08 2025 Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 44CF92E336E; Mon, 14 Apr 2025 13:24:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744637081; cv=none; b=jgn241ViGhEBaZdx+5hTsIWbidMCWGRTa0e1QH76GEDfhSS2UOo00dAiXidJAdDDjKfP9P6fXJZ5ll8zxWVhhdxgqnCfgPDvCAZuPwYNcaCs43dByPD5y0Ttbcr2dLcP78qhmI3wsBxWdS4mjTXjg993UmR6HENfEWocQQL8PO0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744637081; c=relaxed/simple; bh=en1ltXMO9RVI8XlPeqM8dFi0KjiLZRuKlNQuAxNZcOE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=KIWawIYAlY58J4pYKmp7cSifQQxCzDMK4/uv/v7vmQv1urGiaXCme/cv35ys0dUlaPxXPtpHc3duw/ZavZAnUg2su420DeJdhx/Q8THsIZVbK8uAbBzUtxGgpcng1TobO4TDss9aD8mP4wIkKGdHZe/5ccYKec3XsulyzhmCt60= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.218.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ej1-f52.google.com with SMTP id a640c23a62f3a-ac2bb7ca40bso828096566b.3; Mon, 14 Apr 2025 06:24:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744637078; x=1745241878; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LlKFK33sa7P2jc3BqHF+WpGafwhDJ+3yR9vD3sCH0gg=; b=UYHf0nJCOLby1IZeq1EUMFPGhoU6v1Tng00YgAuEBbWlSuAuRozhgC4sVx+Gw09lQt eyKLemWm2MsDCK4/0S9eZ7qTUXzjWrEEFka+MQVyHZIIEr8tufz3Q0zTDkhdcl8nwEjR C1Weqrix3x2Js2k9fKJTEp9RjKtjLc9/EuUyoNABsOmlKqo3RCT7FMtdLRlMpSdEPEhv ybm49NR3pdOqpy7dEvFhCcBoneHB8lCGUQHyOhhgEI3l0ccrTS/TxwtAegVrnvLZ8qu/ 3+6qO9j8b3/fYxbW/W/wxoS72nrwqUTTEadL9ziSVnBavZ8Y67W8OkJ+bUKTDRWGdMdD A8wA== X-Forwarded-Encrypted: i=1; AJvYcCX0GUpSXPuMbZDBMI6HDGM5TCJ4oMv9tlm3/N22xvdZU0xe3O2RrZ6337dQCZT9h4R//WeTSOW1t7O7gHs=@vger.kernel.org X-Gm-Message-State: AOJu0YxbGnQ1ls06SdUJfWBMiSx9Ivq9kdA9I5LV3k/6yDCOVhdNuHJf Zrv/pC9VrG/MtzgiuIyr7v3gH+wLOhYqDnOCKGABuKIAyknz5yQa X-Gm-Gg: ASbGnctAkU/f/P7pEgB3RCWNIWx+pT1b03YBLnqfwGA+WPWplrN8DqO8NnyMc33xZ5X bevjMzgzSVEX++6EeOLvb8L7AG4u17wKDZqRfFVzXayzLiwJct5fWElpJboXLZyYmXJDL4pFQ7Z T6gmMkQeiQjZpbOeU20nWmE6p2jXRYJ4TT67FBVzmL95Xs3gDaBMUyQ58DjuMFPo5aYWraYdXBb kxlQ/eqjKithIBCnfDKY9H9lxuIh/vyatANR7TOeW4JQAvYwfTDYMdwx2wgvka7GLcQfsE4UcFX Qb+uhw9q/zmYVhTLkE5IAFdhGEeyN0AZ X-Google-Smtp-Source: AGHT+IGlim1qfSoItyCErMnd5JVewMxaT7SNIga4O5+vSR/9onzllsWLwh0YUn5+jMeTxmAE87948g== X-Received: by 2002:a17:907:3da1:b0:ac8:16fb:7c85 with SMTP id a640c23a62f3a-acad36a5b13mr1256050066b.41.1744637078331; Mon, 14 Apr 2025 06:24:38 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:71::]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-acaa1be9c0dsm916297566b.61.2025.04.14.06.24.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Apr 2025 06:24:37 -0700 (PDT) From: Breno Leitao Date: Mon, 14 Apr 2025 06:24:10 -0700 Subject: [PATCH net-next v2 04/10] rtnetlink: Use nlmsg_payload in valid_fdb_dump_strict Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250414-nlmsg-v2-4-3d90cb42c6af@debian.org> References: <20250414-nlmsg-v2-0-3d90cb42c6af@debian.org> In-Reply-To: <20250414-nlmsg-v2-0-3d90cb42c6af@debian.org> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , David Ahern Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Breno Leitao , kernel-team@meta.com, Kuniyuki Iwashima X-Mailer: b4 0.15-dev-42535 X-Developer-Signature: v=1; a=openpgp-sha256; l=1015; i=leitao@debian.org; h=from:subject:message-id; bh=en1ltXMO9RVI8XlPeqM8dFi0KjiLZRuKlNQuAxNZcOE=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBn/QyO+waCUv4HYcPoIC+bv90HmwDsIMg8/Hyhw Kai6JjKWYqJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCZ/0MjgAKCRA1o5Of/Hh3 bUmJD/9KzZ5qUtgcXIVwZVPK5oDkKuKoMGHVGbzIR3TwTuWfpHslkvs5qVNrIU43359gHnyzRto /579qTtmQPja+kTGwVDlgh9/SOR0LgWbN6OER11DPg8ysHxFGBb8PxA8HcWYjeMBWeOLX+PBN78 ZoUlJPHNrgk6HRe80D1JYBSgsDF19IjL5jOMx0d+yqKU7Rv82UxyCOnFXSh2eKO6HLXOuQIe/Sz AnfuGESz0ZEuRbRO6nyqT8kKDClHKTKnIR/QbYZRXdvZW0tIuzfvqrfDb2twOZykerWuq/iFN06 0XFL26QAXnLrkUCelbzWMnU4rAO2Xkq36R8Xkshhz/C7lHSUlAZAi19DBulIs1niSYckXpeZsz8 mynZBrE5JYyx8aok1BBp25qUnW/sL7Bb1/UvLvGvXe6m1rCTuJ49HtpfcoFdMyMfayD7M7j68Sy AD7O5rXdzEHdT88risOmTVRjnUb334rLaOEfiiWbdkpAWMeEzNMCfVv1J7B7NfNl95AKFi7+4FS DLC1yLe9wGWBMLjDtI5TqYdHEFG+kriQKSvaCBt6107aAOjL38N5vcj09rvpdvz5kv+cljWLAse I8/LaW+RweXZeB76OrCbD55w1BEfh0KK8VYYzvOS41WOF6YrIv/EsUXb7iICIMAZZkOY6pb8mi2 FHpDdfLWZJHddUg== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D Leverage the new nlmsg_payload() helper to avoid checking for message size and then reading the nlmsg data. Signed-off-by: Breno Leitao Reviewed-by: Kuniyuki Iwashima --- net/core/rtnetlink.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 39a5b72e861f6..31addd26b5570 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -4886,12 +4886,12 @@ static int valid_fdb_dump_strict(const struct nlmsg= hdr *nlh, struct ndmsg *ndm; int err, i; =20 - if (nlh->nlmsg_len < nlmsg_msg_size(sizeof(*ndm))) { + ndm =3D nlmsg_payload(nlh, sizeof(*ndm)); + if (!ndm) { NL_SET_ERR_MSG(extack, "Invalid header for fdb dump request"); return -EINVAL; } =20 - ndm =3D nlmsg_data(nlh); if (ndm->ndm_pad1 || ndm->ndm_pad2 || ndm->ndm_state || ndm->ndm_flags || ndm->ndm_type) { NL_SET_ERR_MSG(extack, "Invalid values in header for fdb dump request"); --=20 2.47.1 From nobody Tue Dec 16 11:13:08 2025 Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 508D224728A; Mon, 14 Apr 2025 13:24:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744637086; cv=none; b=I2R3aG93DG6X0sK97cKqnKjzE/DByyJ72mm6pZzi6ffnG8GDpYa7rzwIM/+a6A2mSRUZmcsfLR460lHUD6olNm0jqoj8FdfcbiOtrrZ04yqI5pi8e4Kh96H4C47O3Kp6/36ga/nim3BCxFlFR2/ht5DjMCBDCFTwAC3wKNoQ2xo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744637086; c=relaxed/simple; bh=syD955WpSQtLuG54Xzxtf7ya+/0Ya5JyfmNpAaFGX9Q=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=oDWUV9OWOdnzE1cL1oQBJzMlCFSV40EZvn0dfsmZky/PB/rHotCJcMo42s4qGz2OQnjdK3dogxygALD983TdHF7gKYV2Wm069GfDICHCu/+21x89KHT0ghRZJSeOMVK45z8uUcwm4wfofWGSc/whCFGuNgKpiMsLSAummPlQoCI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.218.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ej1-f54.google.com with SMTP id a640c23a62f3a-ac28e66c0e1so669011466b.0; Mon, 14 Apr 2025 06:24:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744637080; x=1745241880; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9/q8ZQro2xxVA/d57oIv17tdTCVpCAiyXmf3ekOjhnU=; b=ILkVTLXNPCWw+74mUJ25SxUtCr9SyQqfKi8LVRLf2F22v1Hslm4bLdS4W8aMaO6vZ5 MG+dRK+ZSg5+zNvz3RFktRFi9ldDgdenHXnAHQ8vczNv51fuH1nS68hEUNB1MXZFU6Tv 2w/7AMimkMQ+2hhDb1Yyrxd9T7kzXxUJDj6v1bpz3aoWV5i8NmcP65fV6g7LTQNbtg+l v1k5MH2hA+W35H34C4XP2Biv+Qyu2AjXbTDPb/4eVMqkcVfCp/I6BFvA04FVL6UVm6kM TcMY6PhPdpYZh9XrBLvdsSUW8/Lxj3smNUvc3l02/9H6qdl23JsKCWQGrhGlWtwuvzdT gGYw== X-Forwarded-Encrypted: i=1; AJvYcCX/5S+tCFXGrCskt0XIpdc/md6oHxihkPKwjksSV3uHJmRdraynm08g3YLSTA9iA/jnm/EwvfConL3vIYk=@vger.kernel.org X-Gm-Message-State: AOJu0YwuPecsuFa8eLP4o6WjgeCr98Mjf0CCSCoITXTmGC2rXVHPP2vb ch4dNCSbjbojAk+t9s6EGFjM/A7FWlHX7MkbIEr4ffSVK/cps07U X-Gm-Gg: ASbGnculVUhLWazA/r0tnIBNohlzoKWFXBXgFlBlU/soVC2fy24z6CvDWbCBdqv69cu AoOR2dXJgIEUwgX/KWV4oqFhvfhlfy/JPv0rYROI+HaIvTOXs759nWF+edEuXE9OQ+PDOC+oGPs 6EWd7bdv3Nhjb78cDEU2ds7B+8CoKqo6oy28vT9KBnbWxt+hVJsWdD0q8ygzn6aJ7360G8jNcQl 7Q72aZjPbgTuGFTSH07c16NAn71JYsCQlLZb44qTQe+kA69/FeGJ8wetfmaSMMyxQz6bpvUwvlt HJ0KWVaV12U6X4moyfgbB+UP2m+aX8w= X-Google-Smtp-Source: AGHT+IHnFQH2kjPj2LpTKkQ1WQ4QWUdeJGMxJ+16QBGzybRMOnKQgXbeQIaHesXZWmxH7/0CMKxlPg== X-Received: by 2002:a17:907:cd0e:b0:ac7:75b0:67d9 with SMTP id a640c23a62f3a-acad342ec56mr1161256966b.4.1744637079783; Mon, 14 Apr 2025 06:24:39 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:9::]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5f36f06c4fcsm4995592a12.47.2025.04.14.06.24.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Apr 2025 06:24:39 -0700 (PDT) From: Breno Leitao Date: Mon, 14 Apr 2025 06:24:11 -0700 Subject: [PATCH net-next v2 05/10] mpls: Use nlmsg_payload in mpls_valid_fib_dump_req Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250414-nlmsg-v2-5-3d90cb42c6af@debian.org> References: <20250414-nlmsg-v2-0-3d90cb42c6af@debian.org> In-Reply-To: <20250414-nlmsg-v2-0-3d90cb42c6af@debian.org> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , David Ahern Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Breno Leitao , kernel-team@meta.com, Kuniyuki Iwashima X-Mailer: b4 0.15-dev-42535 X-Developer-Signature: v=1; a=openpgp-sha256; l=1005; i=leitao@debian.org; h=from:subject:message-id; bh=syD955WpSQtLuG54Xzxtf7ya+/0Ya5JyfmNpAaFGX9Q=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBn/QyOP473aRGHCLVkYDPdkgDInL+wKxYo8dVF6 GmYODT7BsuJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCZ/0MjgAKCRA1o5Of/Hh3 bVXND/9UfyYpGcxw4CSwESTsLKvD6jEaBgmVfXfz05uaFmcbXqRdvkNLeBmvYA6qOBBybGKcS/9 deA+j9QAwUdHHztBg2SwtWoTCIvw1djGzSZaRvcGg/YmDbUoXN91AjLCDZdibZ7BJLQ5HaTt3JU HcQg6tn71TpvcCTspA58evCpNqqBm9rHq8FFFLLYqE0B8td9iMJUlOJwlBm6AGJxJWmeiYCsLiK puSrSkNeAK0ic/jvSXEC4mf5SmwNCySng3frTglfO2dOjX47qVqZ0muuuFM4z7GctKRolqQL3cf BGYauEwDh7OxhfA8A5/NjhoSUW0hkpHEvOKmPgKB5zyP1otOJhu8Mdf8oSfH0599RQqkq9winnG fskJcrASf90XW0TE/4SbdvCWCIDowgWEnRfZiAT2c/jUF0Owng+WGNV5baTekL7PUPl2biJy4gu QZwRYrv4uhQDp3sH0JcdnrOUi1dGIDpOLrpHI8OZ004nG2C9zFhglvb554ZA8h1uyM5PwqqeOeZ dxny9h10m8zjVa/HsbauVgsolHE2vXcafccoDc5SzRt7BiiEGxAO4OQSwh4nzaKDD4rkA18Vmmi q/cZ5arVsVPO96LmK8GTM2N1Cxe5H4iFiGADgYia87CjNpgfrDwIFnz5irrMgcOH1KcJDZhVV7w eE7mnVw8cQhHMHg== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D Leverage the new nlmsg_payload() helper to avoid checking for message size and then reading the nlmsg data. Signed-off-by: Breno Leitao Reviewed-by: Kuniyuki Iwashima --- net/mpls/af_mpls.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c index 1f63b32d76d67..bf7cd290c2369 100644 --- a/net/mpls/af_mpls.c +++ b/net/mpls/af_mpls.c @@ -2095,12 +2095,12 @@ static int mpls_valid_fib_dump_req(struct net *net,= const struct nlmsghdr *nlh, struct rtmsg *rtm; int err, i; =20 - if (nlh->nlmsg_len < nlmsg_msg_size(sizeof(*rtm))) { + rtm =3D nlmsg_payload(nlh, sizeof(*rtm)); + if (!rtm) { NL_SET_ERR_MSG_MOD(extack, "Invalid header for FIB dump request"); return -EINVAL; } =20 - rtm =3D nlmsg_data(nlh); if (rtm->rtm_dst_len || rtm->rtm_src_len || rtm->rtm_tos || rtm->rtm_table || rtm->rtm_scope || rtm->rtm_type || rtm->rtm_flags) { --=20 2.47.1 From nobody Tue Dec 16 11:13:08 2025 Received: from mail-ed1-f53.google.com (mail-ed1-f53.google.com [209.85.208.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 456AF247289; Mon, 14 Apr 2025 13:24:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744637085; cv=none; b=AOvxTQdHJRiCAY4YdTmrztbHnrqIK2tJMk7n12f4vsq/iIs432Hi1U2ogI3hH6GY7uONE9VszvwmmK3i7sJOsY6vNxIH6/IKKPa3a/SkS6+7ulrL6IowPuwISm8l43T89WiBlkeM1W01FWf+A4malFelyIUAiQRenLLI75KkTvM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744637085; c=relaxed/simple; bh=BeHZLdzECqUINxpRH3TbRKrvymamvWqDpttGTBLG8kk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=AZjIfZqI/+nyr5+u1aRa6Y5fWU5VLN4IDmuppFeGFHfpvggg3wf8qcc1z9CZakSsYAukW7jhlGqGuJ7fvFc6CjBinvECsxFR2tpa4jKh0ZOMEbfgx5xiOcI4ZAql171jcwUFmciXbdKP3fuAa8VQDU68bjvN7bPHITcYUOzh/SE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.208.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ed1-f53.google.com with SMTP id 4fb4d7f45d1cf-5e5cd420781so8558155a12.2; Mon, 14 Apr 2025 06:24:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744637081; x=1745241881; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uEkPNAzwNjB8l3D6JqgcGTPbVionTGNe1sx+qPQk13g=; b=NqMi0XHvJPWuzCS7/mY/FukPmR968b0Z697fuJK7U4LIB/4Eu4UVomsZ035XWxWAv9 Dd9EyoulahJp7wkO4eLbSWVnLbscPVNDEnfzpzt7hPmweNJdnvAHUAFvmRSAx4ExBmRG wchin+h0o5vxow4XwS+BbyBQhvIlM5feuOX3Wo9dPSvkXQT8nJ6sFZAiz0Z0cz6RWTID tvxtI9MnjrVW6jOZ97XYf01h7oBZFZ/B3FIa3dHa0ZboQlxmdV9LIENkpPF23mW0bQTf dANlSghGKgGKGQvH0a2I8t8gUb6BrGk/ZAmh31Xaqn64Epw04/sDFPyUtm9sUFgB6/A4 kY3A== X-Forwarded-Encrypted: i=1; AJvYcCUvB9IpwlHmJsqaSkYVSgcpnW9dRJvrcNEosYu1c6M3anX3rMiVsd6hWW14BhywOuLntjdtXy/6JM/HZbo=@vger.kernel.org X-Gm-Message-State: AOJu0Yy7A9ajItU8RL/8ChS0voMkquT9Ivy7png7daW+lrksu9fSL6nV rRuHNy+9T8qduIPCfp1d3Ocii1r8rFh0SJ4KFRV0rtg44ArZTqIA X-Gm-Gg: ASbGncu4XY+6kbdvbH5Zgpq1U8RoE63PnOcLcjNG941Yne1IVdy+hcSH5VO7hkjMHGH vdNtFVtcVhkU5ojOpxFqlXaBxVEy8g1mX96AJYyWHYNrJxmjLIXVEMGhbIF3V7wR9MRTu4+UhzI qCcKVgNQstGTxaJiYmIQMoTrE0mVV31qdXyZHJe0mBY1fqn0m4k3BHjKYBWOkt//EQi9DpREZFB 44x0QUqOR7efQbXCdh1rRtD6IlbR6u/z2EOVsljQMex1o4V1Ft0jAr8MSAMCQxR14apzF7QqGlI pnOxkll8GLeqM5eTi9286AmO9kXSfaR+ X-Google-Smtp-Source: AGHT+IFQQNlHXBQncGv93dqH0UDQzDTmNKlSKlaC4dGQwbHvfWdmCHZCAoDKQ3q3Q163bNzxbswVZg== X-Received: by 2002:a17:907:d92:b0:ac2:c1e:dff0 with SMTP id a640c23a62f3a-acad3491ec9mr1108522766b.19.1744637081342; Mon, 14 Apr 2025 06:24:41 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:71::]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-acaa1bb3159sm911015966b.37.2025.04.14.06.24.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Apr 2025 06:24:40 -0700 (PDT) From: Breno Leitao Date: Mon, 14 Apr 2025 06:24:12 -0700 Subject: [PATCH net-next v2 06/10] ipv6: Use nlmsg_payload in inet6_valid_dump_ifaddr_req Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250414-nlmsg-v2-6-3d90cb42c6af@debian.org> References: <20250414-nlmsg-v2-0-3d90cb42c6af@debian.org> In-Reply-To: <20250414-nlmsg-v2-0-3d90cb42c6af@debian.org> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , David Ahern Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Breno Leitao , kernel-team@meta.com, Kuniyuki Iwashima X-Mailer: b4 0.15-dev-42535 X-Developer-Signature: v=1; a=openpgp-sha256; l=1018; i=leitao@debian.org; h=from:subject:message-id; bh=BeHZLdzECqUINxpRH3TbRKrvymamvWqDpttGTBLG8kk=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBn/QyOji0lpgZoo31f34mvxasPoBxU5JVqNNHC8 OHcWOO0PpuJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCZ/0MjgAKCRA1o5Of/Hh3 bSefEACCuaZmLpa3vZYziuz8MJ9l+gc8cojb6qsv7y4MhPuwHEcdkbRRFWLhdytpfm5AIZlEFAk RqqJqNgHEyDCWDW6J3m98EJhUJTvbqUxe4KrKcZd7Ocfefr8aF2JIyP9K22G3HuW8SaQxtvDDN8 xCsJTXkF3yktiyLIVlASiYLWc1tcYpX1k6IDFJ785t8Vn16+p//LCHDCslX5u5PylrWcf9BMkkw gO8AGHgEMTj+GCYcUwLxWDjnqXF0oyPb4NGK9mkFNUHOneRqazNEARiMTOl2g3hI0Zo+7WxTr2Q aStaVWUCdlS84VU7FZCLiFj4C8npRr/hc8IZ17G2fvUfZsOn9iNJ7p3OAWTHs5vSvFc4YoWakn0 nd8NjKwuJRq/YumHJnOxMYTiIUo/1HHausszjy3Z/lKXU4hdi9wFwlDXo8wVBVwz9ziBBcguTfi +TDn8NKOrW1DL1j2XZB8kyP+JIj4sGvYlhe+Jj+RnlN4a10981v8/GSKRM24JNXiBDuWGCL1HzN tdyWjjnNPX25fXDtk0ofz/+GkW9PBQq4DvG0MxJ3FaE/TfRRSdeyfNYdvz4hpFTgwC/DuQ/EZcy i+TMlQdGyl+7oyH5zS3y2cCH6GwXk+Syin23B5t9X5UVowHO2PEZ9dsOGYJh6ROsuuV6pZmC6Hk I4US/JpEQZ374sw== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D Leverage the new nlmsg_payload() helper to avoid checking for message size and then reading the nlmsg data. Signed-off-by: Breno Leitao Reviewed-by: Kuniyuki Iwashima --- net/ipv6/addrconf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 9ba83f0c99283..a9aeb949d9c8e 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -5346,12 +5346,12 @@ static int inet6_valid_dump_ifaddr_req(const struct= nlmsghdr *nlh, struct ifaddrmsg *ifm; int err, i; =20 - if (nlh->nlmsg_len < nlmsg_msg_size(sizeof(*ifm))) { + ifm =3D nlmsg_payload(nlh, sizeof(*ifm)); + if (!ifm) { NL_SET_ERR_MSG_MOD(extack, "Invalid header for address dump request"); return -EINVAL; } =20 - ifm =3D nlmsg_data(nlh); if (ifm->ifa_prefixlen || ifm->ifa_flags || ifm->ifa_scope) { NL_SET_ERR_MSG_MOD(extack, "Invalid values in header for address dump re= quest"); return -EINVAL; --=20 2.47.1 From nobody Tue Dec 16 11:13:08 2025 Received: from mail-ed1-f50.google.com (mail-ed1-f50.google.com [209.85.208.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A962624728E; Mon, 14 Apr 2025 13:24:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744637086; cv=none; b=bAjtDCFIQ5Z2HPH6gserjpQMluChPRNp8Km56y3r3vFMn40GjbTFONjzO8muUqkgbxJtrq+yawKN0aB+Kb40Lwywxl4V69L91icPnSRtz7XdSsMrxNE5YwPyf9YmIaVPrJVCV7/6kv+6UlUP4s/WyrEyQd4rHfR8bQTDOnEC1zE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744637086; c=relaxed/simple; bh=Pi7dAziMSlR3ymqB9s+k3fs1KGbdD8zdHAEwvBXg3ZY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=RaodBBoAly2KSAlSRZcJB6+v4pl8gtBEYVioZyQg7mMPccqk7TScJ0vjRxVKQXOXsT7sfkePo+zSHWV2SEA5I/Qaz8nM/O7f/j25lyKOyWEe/hKcwD3BDfKOBoYrgBoseI48vpnDoNjKCADp61czkjBNjABrwWWpBgGoqg3mWu8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.208.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ed1-f50.google.com with SMTP id 4fb4d7f45d1cf-5e5e0caa151so7467792a12.0; Mon, 14 Apr 2025 06:24:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744637083; x=1745241883; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PSlWr+LCRENelw1f6mytuxXdWnM6i/hVASYqyjr5v94=; b=XF97ORakxrrPyyLrsTacsazVJh0iLNWP0c4W7lbY7NyJO7POCESnWMmBMlnYCjk6jU 7AvJO1KsbyC9FRgNopLakaqrbp06vXu9qQs2XQshos2iTuZf4wR4zBjgkN6D0tVi/Mkg uSs3Ij8WROdmNxoaC5cfb9ZJWiFNZH1gK7FjYOduTieU3maqENfqVzA3DYW70PMSO64A b0Rz4OGlCrS0HftM53QC21WEcbLIb1wxn6hzc6bbfb9cQJNlJFKO20WSJ+8sYYFxUHSV GXaNNX41921JrZLpOrCfeSDtiVYlVLFqTDVz4RCtb38XB3qhjCOff4E16X8PjTForvvl 8W2Q== X-Forwarded-Encrypted: i=1; AJvYcCXsSk1kK6aOCYI+awUuV0cBuBal4emOjjmYzF4DKUuvhz/bEMITKSrE8MvnMYkVmVdS63vdB+Se2X8IsJQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yx0KRKhgzzad3CGOMUWwGdY707oTgMiZYfFaOdl/U/IOHPNAJJx NqVMF6o8SlmVnNDSgruminDcZzS8Me0kVItOrVMkHY/vjQM31UFB X-Gm-Gg: ASbGncsUJgF/vyPkwmCTCwewABH5LIzMY2pL4C5v0bzKSzzkbl4M5mbcNGuIrY94RPz h3FbgkAEF2oWx9Muc5KEg3Uhn87Ce7wJb8RLdtLg/OyDPz0AKMiacvdoEVhPjhugsNoJUNshMP4 xWEXqPOf2PKE/z6xPLGGmZKazPShdi9GxoKP7k/aWv5+O0ufzA4udt25QXxX0LzGjDWYgaJZu2M 419yGQBW/kbbM7D5XAFSevt7Hj3jNXoxPpldP/XG2MazRGGbZQnaKeLcDA0R3Zp9ZQPn4VJFj5N VjmE8qeXx4oVAPSjvdF3XcV//LK//Ks= X-Google-Smtp-Source: AGHT+IGH/bFChpxan8KnZ04VF6vTDjyMXi4Rg+e8qLEHcNs8Xf8UJmWLgWJuTsUABLUOO0fe09LNbg== X-Received: by 2002:a05:6402:3487:b0:5e6:1352:c53d with SMTP id 4fb4d7f45d1cf-5f370292bcemr10499004a12.28.1744637082778; Mon, 14 Apr 2025 06:24:42 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:7::]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5f36f5056b9sm4834761a12.51.2025.04.14.06.24.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Apr 2025 06:24:42 -0700 (PDT) From: Breno Leitao Date: Mon, 14 Apr 2025 06:24:13 -0700 Subject: [PATCH net-next v2 07/10] ipv6: Use nlmsg_payload in inet6_rtm_valid_getaddr_req Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250414-nlmsg-v2-7-3d90cb42c6af@debian.org> References: <20250414-nlmsg-v2-0-3d90cb42c6af@debian.org> In-Reply-To: <20250414-nlmsg-v2-0-3d90cb42c6af@debian.org> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , David Ahern Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Breno Leitao , kernel-team@meta.com, Kuniyuki Iwashima X-Mailer: b4 0.15-dev-42535 X-Developer-Signature: v=1; a=openpgp-sha256; l=1195; i=leitao@debian.org; h=from:subject:message-id; bh=Pi7dAziMSlR3ymqB9s+k3fs1KGbdD8zdHAEwvBXg3ZY=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBn/QyO3Xje36ECT19iFNC4PH++wWurTGneO4Uuo w4fLFZ/CIiJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCZ/0MjgAKCRA1o5Of/Hh3 beCqD/9YfKQ5OyO3mMLqQv796HMbQAdoEvDosywTXtGq9aenF2dMTeOUbF2IsE+6hoDTPscDxrx 6nM6e4fCUIfnZ3iz/hwg4qJvYSpKMcctxrj/kpqxEf00xqyRdNf/wH50aGMQNKEGm6RF8TV++L7 bCZh2f3e5+O1u1QFTA0rRxJhiX3MhElhA1B7fKI/MmHZf9KMNq4sKhdxJdT4V+eAiy7/ybBWmq8 Zg4lh8MAOTh6pfm9F2Fbqd6szlqPjBMNDbXiBqhKudLLVCo0+SOPCuz6Itfpi6JeFRrIXr0agRT QrfLIrUNtOeK6LJjs5X55U0U5xGlEaNhenaDWOU8/X2UnShnueEaPF71VYyutFtfwzCYsyohKZl qVsYsz3i+gbST5fyQcW08fDkaTrASB4hMQHU/GK/JRkgRraDCXP0U1Sp+sDmlSqctF0b4QUSYjc He8D0aWaLtKbh1uYiK/jVf8FUgmkhvCSI6aKrU+xcwYNvCqf6lwNAvUtJQdPkpBPpPZxGXwYFu1 ZI9g5Xiva9tlyQTzTPhhpCsKZq3Pwy8hpneZNyYgFwGSiSMgFDyxs1x8+hiZezsm7mUS0Ol60Zs h+rLjc6JqG0EG3nKX24esEZkCquXl29BHZqUiCXqDtW71KxF2I8LIKHRZ9VPDvK5hTV3XgZY8J1 ReOPE7M6wY1WRsg== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D Leverage the new nlmsg_payload() helper to avoid checking for message size and then reading the nlmsg data. Signed-off-by: Breno Leitao Reviewed-by: Kuniyuki Iwashima --- net/ipv6/addrconf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index a9aeb949d9c8e..4af2761795428 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -5484,7 +5484,8 @@ static int inet6_rtm_valid_getaddr_req(struct sk_buff= *skb, struct ifaddrmsg *ifm; int i, err; =20 - if (nlh->nlmsg_len < nlmsg_msg_size(sizeof(*ifm))) { + ifm =3D nlmsg_payload(nlh, sizeof(*ifm)); + if (!ifm) { NL_SET_ERR_MSG_MOD(extack, "Invalid header for get address request"); return -EINVAL; } @@ -5493,7 +5494,6 @@ static int inet6_rtm_valid_getaddr_req(struct sk_buff= *skb, return nlmsg_parse_deprecated(nlh, sizeof(*ifm), tb, IFA_MAX, ifa_ipv6_policy, extack); =20 - ifm =3D nlmsg_data(nlh); if (ifm->ifa_prefixlen || ifm->ifa_flags || ifm->ifa_scope) { NL_SET_ERR_MSG_MOD(extack, "Invalid values in header for get address req= uest"); return -EINVAL; --=20 2.47.1 From nobody Tue Dec 16 11:13:08 2025 Received: from mail-ed1-f51.google.com (mail-ed1-f51.google.com [209.85.208.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F35202472A0; Mon, 14 Apr 2025 13:24:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744637087; cv=none; b=RQtfuJUypgI/7jEXfSfNSF855VEZfgBSNSnP4OWKS7mJ7IocF2dIsCYSRNQH9DAXR87Is67zy/KpjJGV3pO00tx7Qt2Qp7HmX+A+o7o/fB6V6VUzXXfGbySkSl3IfmTyEMXo0pKHy1a3Qy2nsKuxV/wBs8/vbgT2T6qtEjMT/0k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744637087; c=relaxed/simple; bh=YQg/qWYvHFxoM4f8ermcKKgVE4kd+xFNiuJpBQNR7Fo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dBNV4bWm4nNcwfPoD1T6Yt/1YimQbzF9UKl+KMDp46GUKtgBwDKXJkFwcyRJNY+qntKlrWmotg0htBdd/LSojN/ShYlhEEnyMVgyePRorSECpbTZiexWXbwyHMAWXSxn7Vuamn2o9F4Z01ObibcA9lueVeEwx5E4zuLrR0l8YVs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.208.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ed1-f51.google.com with SMTP id 4fb4d7f45d1cf-5e61da95244so7311748a12.2; Mon, 14 Apr 2025 06:24:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744637084; x=1745241884; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LI6HihxDuZwvoOMZr+bMeFHM8HI0NzjEPZNOZ3+r+C8=; b=l4Oa4ksD1/ek2lgsBVoCVvmy1VFlpfY/OJDRcR5SVJ2AK/Cc0iIogjFMeO+gMPf8IB whf1TIdJXTarP1Uz2SQr8z30HswJTA9ygeBY2bIQkmlhisGMJ9mm1Ur1HDvo9Uwc7A++ YC9Ha3xbuJviQMtCXZMuhRHlSsj4a48rYVO3i1CRh+x+Jf8Wq3145tJtJdK7tVuAOPYQ WPiftzThzR0Kd8G/KoF13FUH7WIyi1aMzgYxspZir3CDb+NRBuImDjR2ZqLzc8/zeut3 h/dhLU2jlC7M9XCbgwmyU5ZDuctSpinFrBzlmvB50hNEVTsXArxa02urnaLxShKsQ/kC 7Uug== X-Forwarded-Encrypted: i=1; AJvYcCUR6W9QCisXj4E7tu9j//c6k4w+NXBu6QX+kS7YXX6NSQQslhCixlRWk3gTlN+izZxBhFIhfyHlPUWL2Q0=@vger.kernel.org X-Gm-Message-State: AOJu0YzjGPE1OTCu/VvUXIs0EAOcnc4nAgjux3k7LouEEz1wFaP4p4Hx 4tn6ym3aVZDQDAHyCRQtdIYLWaPr7egyJUIc3B/hwegdHOFhN6nsk1Q1CA== X-Gm-Gg: ASbGncsPKOKtWsXobYC8+9Trek4PuU/OHFwlXUtWdvwWLdYMGV9AxZS3OzYzBj006KB x6/dcYFJO2CLMDJ/LvrW6aj86NpGrmmAcWEJPH7f0HanNiVDvfGaXenHhGDSFfgap85zI8aS09z w6pungkBQy4tu42S6yiKIwvV27NWbwhNWF1uE5ApzWuTadM04gcZgXSd4b/xcfml2rkeOh+KbTh Zo+/so2u6OwqIcot5zFbu0yQEt2wGMwn1tM2T/encXGRGZSG85ybSkL21D8Mkg5PGLIskax6NHN 0QVZnOfbnHnZjZcRI+zDeSr325YupTLx X-Google-Smtp-Source: AGHT+IExmyzZRYXmO3HjhV9AjkHgDbC4nr/NFSbcShUM12FI+2b/nPKqhAeN67dd51RrpU8z0Q+EeA== X-Received: by 2002:a17:906:d7c5:b0:acb:107e:95af with SMTP id a640c23a62f3a-acb107e9857mr23014466b.39.1744637084162; Mon, 14 Apr 2025 06:24:44 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:72::]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-acaa1cb4129sm925470666b.98.2025.04.14.06.24.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Apr 2025 06:24:43 -0700 (PDT) From: Breno Leitao Date: Mon, 14 Apr 2025 06:24:14 -0700 Subject: [PATCH net-next v2 08/10] mpls: Use nlmsg_payload in mpls_valid_getroute_req Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250414-nlmsg-v2-8-3d90cb42c6af@debian.org> References: <20250414-nlmsg-v2-0-3d90cb42c6af@debian.org> In-Reply-To: <20250414-nlmsg-v2-0-3d90cb42c6af@debian.org> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , David Ahern Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Breno Leitao , kernel-team@meta.com, Kuniyuki Iwashima X-Mailer: b4 0.15-dev-42535 X-Developer-Signature: v=1; a=openpgp-sha256; l=1190; i=leitao@debian.org; h=from:subject:message-id; bh=YQg/qWYvHFxoM4f8ermcKKgVE4kd+xFNiuJpBQNR7Fo=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBn/QyOiR+G0oWH3XRn0rAQBEj1p4pf0a15a3fZO g7yu2v13xKJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCZ/0MjgAKCRA1o5Of/Hh3 bbFGEACRdGuLdyVGQwuM6QlPKl3v0p2Urcb0G9QDEcdD0qf5Y+LcPGoDQtG6kA+M60PwIK2Rb3m D7cfKT230HeZ0bZguRCkWjhlk6eGDe7KxTP5ARijgv/Vmax4VdpXsUozz5sKgruerY4nf782y36 H6ntzOpP5T1MC3qkGBeuvHSzJj/ib2ZB049dMIlInx2wPSg/+HjikDMyhb2IE/6nO0Eg4oWQ77k pmMsihzHs8rwHT755zNS1oGUSSj4Bf13BLeufSa288EbhIkIETGA0CX3a0NBKH+LKRiZNFSC7eO CJwH5ByE9RrUopUj7Ahp5FfeIcIP2GcVKB6KGRRBmeaFMQ5FkUIwokOQzbvxIJImNc8vBJZPJxP nr1p0TDMQNlWvl0yat/waaGjAOPZ/Psa4vjeB4n4jNqKV0oviFcYDj60dhTkxaF8C3VosIl2QhZ TTLxSw92XiWJpDYk+akNpTALY1acZWQ6sdDGjvcfQ1pZ3a9sUNbYrblcCARchzRryCTcB5uCxbP hslaN7QBFJs89TjNIZ5NdvEaqZGAX5cvwZ77AHUp/BANtNE+z7WLot0E4WrX66NGpBRVzPH+J5I V0QeeecX0+sZvfCxGxEUKRkLx1r//Xw3Pm2/mWJLoOJYS9iN3dk2YV82S+d7JtYlYY9B3eaesTw 4N2o9hEGxR3tT5Q== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D Leverage the new nlmsg_payload() helper to avoid checking for message size and then reading the nlmsg data. Signed-off-by: Breno Leitao Reviewed-by: Kuniyuki Iwashima --- net/mpls/af_mpls.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c index bf7cd290c2369..d536c97144e9d 100644 --- a/net/mpls/af_mpls.c +++ b/net/mpls/af_mpls.c @@ -2288,7 +2288,8 @@ static int mpls_valid_getroute_req(struct sk_buff *sk= b, struct rtmsg *rtm; int i, err; =20 - if (nlh->nlmsg_len < nlmsg_msg_size(sizeof(*rtm))) { + rtm =3D nlmsg_payload(nlh, sizeof(*rtm)); + if (!rtm) { NL_SET_ERR_MSG_MOD(extack, "Invalid header for get route request"); return -EINVAL; @@ -2298,7 +2299,6 @@ static int mpls_valid_getroute_req(struct sk_buff *sk= b, return nlmsg_parse_deprecated(nlh, sizeof(*rtm), tb, RTA_MAX, rtm_mpls_policy, extack); =20 - rtm =3D nlmsg_data(nlh); if ((rtm->rtm_dst_len && rtm->rtm_dst_len !=3D 20) || rtm->rtm_src_len || rtm->rtm_tos || rtm->rtm_table || rtm->rtm_protocol || rtm->rtm_scope || rtm->rtm_type) { --=20 2.47.1 From nobody Tue Dec 16 11:13:08 2025 Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9E16E253953; Mon, 14 Apr 2025 13:24:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744637089; cv=none; b=WFp9vLRxQwCX3nk/oV6JGJllXk4fMs7gmuiKQeGu8cPzEdY5Z2m9w3S5ZZH5FJ607pKAU8wUuirLMrGuhe3kLj9WVjUrZelW/rJwQXuO5M0V1ptbE++0zT4h7HEWblahqy48jmJW0ZSX2Sf3+6o/PeWJI2EtVR/QiRj+9WPQmpo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744637089; c=relaxed/simple; bh=RcTBEKTPFJ5T/ILitl1DJk8clpZbZgc5WWpG2zoR5iA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=rxIUV9GiAtL0cnErxd7WBFbiGIi/EGnyp9E6i6KaREkORUxu4bEc2gazmwZNRrBAhn/wc9cH1dOTuY0SPPPU/qeb0mBe+qyWdt9kQTkswBUlzhd9PBjsHzBuJ4VFJ9jBEKPZF1CFfc/jD5YEtAQJxfQrJd04IY4kTomqcJ9kaWA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.218.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ej1-f44.google.com with SMTP id a640c23a62f3a-ac29fd22163so684017766b.3; Mon, 14 Apr 2025 06:24:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744637086; x=1745241886; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=y3koL07yK6bzyFRSB6cDLpngM37ULVLmyCPPSP64O7I=; b=dLnNfaujRebAT3uHKgrMz13nGUO6SLiCvXIrC6OzhIJ2oReLNTMSCbbif5Q9e38SuB mgebp09FPPSx9AavJdAN/7n9Y2c0rU9COvosEYIwZ0gk0S6hgnCuFwWWq8+54x20LWm+ ze2/itXqIcvKyEYcvChIvtMlGuEumR7OYC/qfYlNPZ21GR246+WLxN0PPxUQ0znGI1Ww XHxRgq1hzTb73e2ifjqM0Tx4fmchx45sv0wpY6+ZIjvJVbVqFZo0hY3oRB1iJR5fibMI AkBKpZduCbBPTuIWr2rQT+ciTPUoSbzREFTlulVZfmjbuyCP/ygdsyn66B8KahhBsZmy N62w== X-Forwarded-Encrypted: i=1; AJvYcCUPfSQwT6WUZGjFrQO6m26Wf0nqRME4ZaBciTi/Y3HBuMJQkh88msSwqOhWmNm+G2XD/Cx4x7oNNsN1K28=@vger.kernel.org X-Gm-Message-State: AOJu0YyX+bQtFvVWAor7t2L+QMylJy3yLAgv+I9JNvLFVn2mGGsBsMvo U6SHkQgCgfv9xTbhQSzIGnnXxFnUYPeNqvN11LO1JcD81wMGEH41 X-Gm-Gg: ASbGnctbExWfycKHPfjKWgxCNCIAfjRSznOwnGMXqH3JwoMbKX7PvJ+QGfogqtWP1QG yhJLn4fRMTQuR/IH/iJLN8zV6XNodW681Zkz0Cx6ByxwEFVU+AXPPYfm6qyquNjy8jrmp4jGRBP TzPIgKWuBIq2fTkqvr1njJZfRW35Fr9rxEWVbhqAuer1j4U5Bt4oaH+bjc9mgXY86uMQzo6BUOZ 6LWbEbl9J1rQmmP4PVMAYGokAag7ZEjO0OfAjZd73Z2HHfyzZIHpXFXnW2eHqZ8t0hW5SsSayUJ Sp6I3TiRrgW5mPa+iZyRrkym+59+Yiq8OV0pTWPbHQ== X-Google-Smtp-Source: AGHT+IEchQeIHdLjWaJ+ImMbxhPU93jorw9zZlelRxJiEiOxsNpF7jAH+WV02i+x1nLasrz6R/Otsg== X-Received: by 2002:a17:907:7247:b0:abf:6d24:10bb with SMTP id a640c23a62f3a-acad36a08bamr946303166b.44.1744637085646; Mon, 14 Apr 2025 06:24:45 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:3::]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-acaa1ccd255sm897451566b.156.2025.04.14.06.24.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Apr 2025 06:24:45 -0700 (PDT) From: Breno Leitao Date: Mon, 14 Apr 2025 06:24:15 -0700 Subject: [PATCH net-next v2 09/10] net: fib_rules: Use nlmsg_payload in fib_valid_dumprule_req Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250414-nlmsg-v2-9-3d90cb42c6af@debian.org> References: <20250414-nlmsg-v2-0-3d90cb42c6af@debian.org> In-Reply-To: <20250414-nlmsg-v2-0-3d90cb42c6af@debian.org> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , David Ahern Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Breno Leitao , kernel-team@meta.com, Kuniyuki Iwashima X-Mailer: b4 0.15-dev-42535 X-Developer-Signature: v=1; a=openpgp-sha256; l=991; i=leitao@debian.org; h=from:subject:message-id; bh=RcTBEKTPFJ5T/ILitl1DJk8clpZbZgc5WWpG2zoR5iA=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBn/QyOkuwTAE/K6yal6HFF0j23gItUFnv7yu8du tW6+MtqWr+JAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCZ/0MjgAKCRA1o5Of/Hh3 berID/4xwXPUq3WwlgCs6duc6CE+cZjFzhVXg0piuy2MZTQ4VqUDIsGhUy4d5evUu9wxzPredRO t0eWguB17lKdrqlJK7UO9XLRiCk7Ex51lYzOJI9KkjwnpEmIE9n7+iU/1UvTNQfodHBcuNAuhIU p0qDEhB8fkCMQvVYLx3/aq6nbgx3ooTYdyFOoRInUkVaJiSqQXLVoHNwYo4UC76L9heOAZ5APZ3 I91Db0Cfz3vhN+NdmIHxMqx6pydwPdL+HFcXLosINbSZ9kuIlkHEjXh8dJRvqgYaCXcM1OWZcil bzOxMTRe6lmCrUuuhuwrdAuSxRiUdmVp/C0qHfBvgZzhHByEWUXsnk8c+MROholw8zD1r+TUGPu ADtoQ5TcPvU1vS7qf3MJz0/KUqh64giskOfIRows8XIQbLzJHzz5JbYglX3MEyo7g4kh04NQ0h6 1v9qzMT9e++YTUgew/HH5UJflXyKKPkZup15Hz7+bzRKm/rJCGGnQVyFDdcrr4gQ52OduYXrjIZ WIzGolXHw/43myhhcYw21ryqlAFClL/zjytPfAgTLwpwNpaHCAunQRijHbLgZUAYnlpZNQyhhxO CvOZvHJWmXt/UQCRxHczM3KjAZHnhnUO1mqO8jfONaa2MB/XRNrGDeqCRX6Jd1359rXsYm39aih 2AiR+iA2F0fe5dA== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D Leverage the new nlmsg_payload() helper to avoid checking for message size and then reading the nlmsg data. Signed-off-by: Breno Leitao Reviewed-by: Kuniyuki Iwashima --- net/core/fib_rules.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c index 4bc64d912a1c0..6a7a28bf631c2 100644 --- a/net/core/fib_rules.c +++ b/net/core/fib_rules.c @@ -1238,12 +1238,12 @@ static int fib_valid_dumprule_req(const struct nlms= ghdr *nlh, { struct fib_rule_hdr *frh; =20 - if (nlh->nlmsg_len < nlmsg_msg_size(sizeof(*frh))) { + frh =3D nlmsg_payload(nlh, sizeof(*frh)); + if (!frh) { NL_SET_ERR_MSG(extack, "Invalid header for fib rule dump request"); return -EINVAL; } =20 - frh =3D nlmsg_data(nlh); if (frh->dst_len || frh->src_len || frh->tos || frh->table || frh->res1 || frh->res2 || frh->action || frh->flags) { NL_SET_ERR_MSG(extack, --=20 2.47.1 From nobody Tue Dec 16 11:13:08 2025 Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B203427585C; Mon, 14 Apr 2025 13:24:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744637090; cv=none; b=EpQ+YABmDV/Z5uJhDX/bilLjTltM/nQwinAAkUNUQVSuTnyjUP7f2XNMf502XBfFlBOybPd/tIfjXcT3PbxrTXMwwnuW8C5XgEq2jvXof8XfY06BdwLj8ULRWkiqSGmZB6ycvMnKiarXQ9Sc+mkUMji6MpbkmMeA2R5aG0VeJY4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744637090; c=relaxed/simple; bh=QH4HBkEgzWlR+iLppNxzhUiHrA5hDihNEzcMAW7W4Oo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=fmNRxZw0RrwBujwmbO9PkP8lB+SdqDOt6oEbL1pv4s3lZD3N8wGamljQAVB7ZOz6b2a15w8kTeFHP6Ne4+82rN49PnzjfZit5y3mjCXdx3mYvQzN4+xItwFnuTLUO18nKkSQkmOhNZkY7vP3CPdmEAVA2J/Z3Nvkjaf2pfkbBv4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.218.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ej1-f52.google.com with SMTP id a640c23a62f3a-ac289147833so866674266b.2; Mon, 14 Apr 2025 06:24:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744637087; x=1745241887; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZRtNPlxz2zfsOHt7gPeh2UUvvFdJM11RSUvY0S+WMYU=; b=APeJONcCn286sZy66aYe+LgaT/3EFz/WatTUntgPKOMt96yulQb7BI7rhxzEY7hNtM LSCV6zbPtd+e/EF/vtgW+aWXITw7IQD0goiQvqJUF9BF8yRSxkDGCeOubBGou8WYKt4u Mps5sdVTqdtvqiXfkHl7RXXSIjJotBcD95sBz1LN5MT20bmFd+XZEH3sxUO9csnly8/a ziUqxjFUZ4rkcs3IlQ5NnS0MuemI/CKFgsifJa2YKSmkkqCopokzSZOk1rXQo1u+ywbG j9vq1uBcLX3D4H5Mx3jMf4Zg4Q6IO16HECnCz9Stcbd+tbd9mB3Z2ySfnDBpUbUSLP98 GgdA== X-Forwarded-Encrypted: i=1; AJvYcCU1ifWjG5770oDD+jcrTJTd1Z5fAnlCX8rE0kj/9XZIxoddliAU1G/oZOHMchEGGddNg70D1sdFYWxaa/o=@vger.kernel.org X-Gm-Message-State: AOJu0YyIT5lj/JHG4EM0dlfM+OJqgqVYvHDtC/O0wJo3dLQWlYepBkOt k11aa+g4LdP0BxWPSW5nX9sP+Pf5gLeK1tyfab8Zx6c+koOfymgy X-Gm-Gg: ASbGnctqigL0f5zC7tS0RIfm3tZ1d0X1UA1mPzUFAKuXOnsKA9VOr88AbzGcigvCurE 91ngxHuzUg1hGYROnkzz2HYauL1lHH/4Rjk77rsRpJkJCOOwV+oj1AwZAfnzIoC9BWYXvwwhdeF k7ie1MU+fk76rHUtvHUZXOUwXwUTyab2kcc6pdWZAm+Y/KTYLA+H3OqOTsnasjfJK6yOuzyyKuL wcWoKshngSHb3voNbrRkoRxUfGuqin8rCH/vniyrPuk6rQjVYvF6qy9iIk7il2phTcSIKkZvwS7 M2FBMOiVB/+KcH3HKk7CbrYICo3mINQ= X-Google-Smtp-Source: AGHT+IGOWuCkTf+8tbhnvHToKES03iq4QshkRj7yoBfScEmpqVGoq4VGxClzsOy3zoBI1YXrodGUDw== X-Received: by 2002:a17:906:4889:b0:acb:e1:6503 with SMTP id a640c23a62f3a-acb00e1666emr226128366b.50.1744637087053; Mon, 14 Apr 2025 06:24:47 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:8::]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-acaa1ce7fdcsm921165966b.176.2025.04.14.06.24.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Apr 2025 06:24:46 -0700 (PDT) From: Breno Leitao Date: Mon, 14 Apr 2025 06:24:16 -0700 Subject: [PATCH net-next v2 10/10] net: fib_rules: Use nlmsg_payload in fib_{new,del}rule() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250414-nlmsg-v2-10-3d90cb42c6af@debian.org> References: <20250414-nlmsg-v2-0-3d90cb42c6af@debian.org> In-Reply-To: <20250414-nlmsg-v2-0-3d90cb42c6af@debian.org> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , David Ahern Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Breno Leitao , kernel-team@meta.com, Kuniyuki Iwashima X-Mailer: b4 0.15-dev-42535 X-Developer-Signature: v=1; a=openpgp-sha256; l=1686; i=leitao@debian.org; h=from:subject:message-id; bh=QH4HBkEgzWlR+iLppNxzhUiHrA5hDihNEzcMAW7W4Oo=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBn/QyO/SuSwBqi5s9qnVkbc6llOeGblYxm27yEv ZvXm0acPDSJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCZ/0MjgAKCRA1o5Of/Hh3 bTecEACpv2HtCD+FWwLu+5RJN460rj/87oBfaM8dK1Gu+3sOHXt/OW/YdI0jkj4HC+uz4OZpLKj 5YeLycdVwlfHUf23eT04t7VlcTreOucWB7SmfM6MCOV5EbdnAxwGxczKSI53HZG3fM4ndTIE2Q1 6vf+/BZO3XiX47Z7GZ+Qh9cdp4Zvqc/fSltIVCldkp7P/81DsWwKYRep4CHehWMHJzzEDRql469 huXTxjzBH+aI30gCjBXCgCuUpLFqPX/0D7bW9H3GMx2q9kaoUKmj+DDTonN6frejmSoWfcF8Y7e 6ELwFg2oPC4ENWLlXOhHJOX8ddKqqtoNiDh29MkxsNVgpmmjJ6XkxkEU/BABAA/uIM1Fsbi/93f 4gV+uS1LIsrmWu5P2LO9hC2BcHutVQNZXoggNkWOieoMkaG4ZrXEmUeom+C8Sqf6obe0gzDR+Xf SDlvUwRSKL+WT9lBrKQ/ybTganD2KRnoI+aZibaukiDqQ0H4FsgBkhk5xJWcwtAcgFepk9by561 ccx8tzzBPtz3HRqFxhpeKyX7LtbvcXEvpUaiXvWH9ur5DxIvSuN5q0JTwUrj2jh6XHxVEd2K+U9 /qNMsJNBFn2SYRS4ugTlnb6ZIRDHH5Nq67IWy6aOeBSV3q7uHXU6qJIZUDfAsRlFD1LisGh81rR NOPSYSElMrNXQPg== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D Leverage the new nlmsg_payload() helper to avoid checking for message size and then reading the nlmsg data. Suggested-by: Kuniyuki Iwashima Signed-off-by: Breno Leitao --- net/core/fib_rules.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c index 6a7a28bf631c2..06052b6c946b9 100644 --- a/net/core/fib_rules.c +++ b/net/core/fib_rules.c @@ -852,13 +852,14 @@ int fib_newrule(struct net *net, struct sk_buff *skb,= struct nlmsghdr *nlh, struct netlink_ext_ack *extack, bool rtnl_held) { struct fib_rule *rule =3D NULL, *r, *last =3D NULL; - struct fib_rule_hdr *frh =3D nlmsg_data(nlh); int err =3D -EINVAL, unresolved =3D 0; struct fib_rules_ops *ops =3D NULL; struct nlattr *tb[FRA_MAX + 1]; bool user_priority =3D false; + struct fib_rule_hdr *frh; =20 - if (nlh->nlmsg_len < nlmsg_msg_size(sizeof(*frh))) { + frh =3D nlmsg_payload(nlh, sizeof(*frh)); + if (!frh) { NL_SET_ERR_MSG(extack, "Invalid msg length"); goto errout; } @@ -980,13 +981,14 @@ int fib_delrule(struct net *net, struct sk_buff *skb,= struct nlmsghdr *nlh, struct netlink_ext_ack *extack, bool rtnl_held) { struct fib_rule *rule =3D NULL, *nlrule =3D NULL; - struct fib_rule_hdr *frh =3D nlmsg_data(nlh); struct fib_rules_ops *ops =3D NULL; struct nlattr *tb[FRA_MAX+1]; bool user_priority =3D false; + struct fib_rule_hdr *frh; int err =3D -EINVAL; =20 - if (nlh->nlmsg_len < nlmsg_msg_size(sizeof(*frh))) { + frh =3D nlmsg_payload(nlh, sizeof(*frh)); + if (!frh) { NL_SET_ERR_MSG(extack, "Invalid msg length"); goto errout; } --=20 2.47.1