From nobody Fri Dec 19 09:42:07 2025 Received: from mail-ej1-f51.google.com (mail-ej1-f51.google.com [209.85.218.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 A1134218AA3; Fri, 11 Apr 2025 17:01:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744390875; cv=none; b=Q/6+vUbKdqvd2RGLQHvnq8ldFMMhCAy9Ej4F9cTwRgoLolfNHes0K4/RJFYQRzOsTmbcnaxD7uVcciPI2KaoInuRaclqE7NX0YLy3Bg9FcNEC0VycwyvQKh1C2bOEQqM227sxrWAsnEZFc66zENXsreooSE18UlcGY5PeZ9Tjp0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744390875; c=relaxed/simple; bh=ME7ClmMteJ7nDa5z/JxEa2egqSSEhc9E5r8PuiVOl9w=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=rLYKSuCOjwOtFAvNxzYUjeEuPI8i1HjxtW8CimS71/Iiad73jYvsUMCo8KazeB5ThrD72q7DXAOEEQer5o5QPb3D1tG1k2dayD/p4bPFvaP6Bvrhny4xkqmxhlkWBRvXYifPcWPecHchArUfcmDPcvrQueDcnFa6lSV9CTwBo3Q= 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.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-ej1-f51.google.com with SMTP id a640c23a62f3a-ac25520a289so376985766b.3; Fri, 11 Apr 2025 10:01:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744390872; x=1744995672; 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=817YhAaczftGiJDT0IGuOETYiXsxv+uzR0LyvC0my2Q=; b=b+2wvbPO7ygGCnE2mp/By7b365uFTXTmPywKwwDGlsS2DQ8evdu1nAW6exdS77qzUS lyxC/nWWQKv5TKrbjpm8kkOeMfnTrd4paqoiymskDVAQgqKgCDeUqAhwhBbaiaXXVUvD CTK9u3Ga5GI3NR0Si71g21sEH6cLqIrqEnC1DbAaA4C/qhhEUoftqRLyuq9VQQmUQZ/0 twuz9NVRmcDEY8IwO2QzDitpGv6ag9dRSNaevag76YId5p+Wk/6FVBjTu/J46S77obxO 28RNfav63TXJo0gTzSNL6xv3KzfKMlKr4P+QeumPQl/Z6BanYHVIcs2Lvd/xVpSRSBmJ oAPA== X-Forwarded-Encrypted: i=1; AJvYcCVel3ZIfJ1h3Kf+2HT1jIkjHMJRFs2BHj2IMtT39DZutGfuDP/AHKHoqUkuK4V6bGXIBszi89BUPXsP/+I=@vger.kernel.org X-Gm-Message-State: AOJu0YzCl0hXRecG4sd0asqgjYhsrEMlDMLKR+67F/MlZBYg4Xdf3HLk uyYn/yhiwxeJMFnzR+8D2IWny5JRCXf/KDjkS0KET1x00EumvwKO X-Gm-Gg: ASbGncuvWHXzc56AIZ4EHzaTTcnkMDy1KpjVhWWuKPle4GerP+zmWoYsyX0DJQezjwa XEjNuGSkW61vN9vjC6C5KFv3T4QzHomvxsmGbrBaKYJE9r9m9ZX+v9n6Rok8cmD7SgL/hH3PWGu GL0YVIGFeZ8zFzy960NwVBpyI73xCHxUwPhuUFSyXYeVoMW4SiFRf7Yg1P+eC5ln2o5o5y3JatB xzyVOQ59Y5kNUZOnsxnAUWVQTxa0PFEikc4mFMZ+3ioOONuCLKUV+azGyGvjr6M3dS3kfVx5ntU hcvDzeO2fSm0RS3EhDsukrfvMYA8jw0yJTNby/d5UA== X-Google-Smtp-Source: AGHT+IG5BzDYosurloDcdSU09bzmSf0Krf4PprX7I6P3tGPXgsMk16Rh7dwaQu70f/aCF1kmDIiFUA== X-Received: by 2002:a17:907:97cd:b0:ac3:3e40:e182 with SMTP id a640c23a62f3a-acad3496730mr291571866b.19.1744390871534; Fri, 11 Apr 2025 10:01:11 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:6::]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-acaa1be8d19sm464895066b.45.2025.04.11.10.01.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Apr 2025 10:01:11 -0700 (PDT) From: Breno Leitao Date: Fri, 11 Apr 2025 10:00:48 -0700 Subject: [PATCH net-next 1/9] 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: <20250411-nlmsg-v1-1-ddd4e065cb15@debian.org> References: <20250411-nlmsg-v1-0-ddd4e065cb15@debian.org> In-Reply-To: <20250411-nlmsg-v1-0-ddd4e065cb15@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 X-Mailer: b4 0.15-dev-42535 X-Developer-Signature: v=1; a=openpgp-sha256; l=1107; i=leitao@debian.org; h=from:subject:message-id; bh=ME7ClmMteJ7nDa5z/JxEa2egqSSEhc9E5r8PuiVOl9w=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBn+UrTlAsyfVS6GdFs4Sb9c+lm8ZIgQI2QpEm/B POZB/LMTImJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCZ/lK0wAKCRA1o5Of/Hh3 bR41D/44EkYUkFWlZ3hRtTylLKgxkZ02zYyg70gHYtR/V/nMxXSQT7/aD84w+8ZkB2UIT65LtFL fpKYv4OjrzrcCNbuqg3nUFA3L8uobj4fyBXD+vTZTH9rUB9BIjukaqmD2+CDfUmQMSzTJwRXh7f lNyK/LyCxeQPDi1DPp8nzOdPv/nVVr/pRy9pEJzvKhZto3im3UlLkVR5MAir+0wb5hiuZpnPkOR BhL80lbRTijOVsPxRrllC4U2Lm+0fjob0PjSHV4tYnjf0Da04fes7yZBt8oaQ25f5AYhyIftrk0 pkXaQVsP4sIQEVhEVyFHZtgKt0Ob/7E+83TMnNpL4s4nVRW6BJmkFJzX/QOz3f8eMItG0h2ssWa y9rUbCyXdzhcYOA5iKUSMasbhKc8gx5Af06wnPpnjARjIPrilmopBa3xsKsfDI+SRuUDXXRMn6E P6GkrxcwGHydh3QftGNSsfsXPMZdlaHGc6hTcQmSaAiqSfoPwX9dFOGVLyWQlS/IpX6IeC/hTEI XuZilyY1jO/xwwg8LOt4tUejXOoMtFzaf9K9OzY3jRJneFB0b0QRtmvd9Kw/HSjDzgkp2G5wA5P kVfMtcwOKJobNfAlyEaYhq0qXi32YgGey5Xt0+y8G9kIc6Hh/anF+4YAB8gI/THlh8eFZQALHxK jBbFhU2lyOImkXg== 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 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/net/netlink.h b/include/net/netlink.h index 29e0db9403820..6343516f131cc 100644 --- a/include/net/netlink.h +++ b/include/net/netlink.h @@ -611,6 +611,19 @@ 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 + */ +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 Fri Dec 19 09:42:07 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 6D570221FB8; Fri, 11 Apr 2025 17:01:15 +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=1744390878; cv=none; b=RIwPshYqY1aAokDF7tSCtb8sBI3cTFIIImRPB7983eHNelcFyRwIHWI0oX1l5tV+oaNjXUd5ePM3Igwnw+TVPNfNVOHT+CdItmni1Gkwrtti/wasfx50dP/hjc3u+SAf5m3SLhDXkkm17LijjYnZifll5HZd3TfUca9IBnBHdYk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744390878; c=relaxed/simple; bh=gHJ3bSUsNw2+03fX44wo5CdaZHCsae1EVtBp+WMaMGA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=nla5QgjgiJPQHv7xhQ+/7YIkAGMWWPSLhZq+oMJSpNyFUGxsHCQRbjtGqZwn4X6KU7Sj8//VYVnVZjj24OnwmVpYNpJJARIPJmkG2M6O2dhmjU8wBvQiuI19HEeuZbJILZlS8p+lAL5QF23rNKgDUUtt1VOBbAR6DBXBXepRvJs= 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-5efe8d9ebdfso4015998a12.3; Fri, 11 Apr 2025 10:01:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744390873; x=1744995673; 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=xjDYrHY5UwENbrmtSlOetx7xyOap0e/fxOAuqxRiP5M=; b=wIvbakcjnNDp6GTN40+LZ24uor4lqWzADRYeP9TwsBHCR/4bgLCXzDeG57JR+ZoQEg JQsIvRKLmCSx1aF0a/7cP8U8+GgWdcx8W+fqhCuGcxNhFnBhgDQBls1IscMXtgyJrk40 wyReLPsC9Mc1VrxGbtJpN3gcknmhhftBHnmg8wfM3tT384e6Qx8OgFV5SjheAFbFLsD6 gEGAI2vUB/2UcwYmIiQ3A3CfKpLqL5zo97h0fY4nQDMTPcARM0gDTqekFfzCMMhw2kj7 wedN/2M+lhhsZxGSOcFDwGjp5bRmCyAxgprlzbWdivftH3UOoHtdhAoTI/a2ATuCY4KC Qk/w== X-Forwarded-Encrypted: i=1; AJvYcCXRnWKD+b8vPBm0Pr05KsVp6btJuR7mIO3bLw8JOsW4oGwElTyYSeuHe1HmOD3PJlFNEMKKcyqg6oVp1s8=@vger.kernel.org X-Gm-Message-State: AOJu0YynKLK+iY+TPFBV1rdpG1EUS6K4ntTJlby1RtqmV4HhNWRe0V2X qvATRvZEE1XN1DhQu+Z/cE0XiM66uqisjfSqa4S6bijJkQXIujku X-Gm-Gg: ASbGnctMrKSeqJp0pcAeOQsLGAR7tLvn6pkXI/p0C61WXjZpNQeWATJEyiUE2/FfaHX t/BNIUWwuMHLr7TsnJTIBbBU9lXUa3FVo9f47lPcgjUc1jRyPP7gEx9N8LKR1MuY+guWCzC/6JO 7bQ/9kUfS6FMGtevTvkFSAsh2iE4owkTHrYiEpD5949B8o5zKjxNe7vGZzg6KqVxCQQNmxX1pBr tB2xOe3MS458QRs3w4+z8PrsPS0h4BumTa8NyRyg1J8ZlpE/gn0m0bIIob07SEcBF/JZWsByk8D yhGB46tQQjmK8bPYdLeRvZxuf3fDUO/W X-Google-Smtp-Source: AGHT+IFoCRRFXyLMCddkfC5BWH1HgAoI1FkX7SZQj5v/B4EHfAEHRh1aIRh88BNMEGYdnTAhvm89BQ== X-Received: by 2002:a17:906:6a12:b0:ac3:9587:f2ac with SMTP id a640c23a62f3a-acad352b7fdmr363835766b.33.1744390873165; Fri, 11 Apr 2025 10:01:13 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:42::]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-acaa1cb3fcdsm474541966b.107.2025.04.11.10.01.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Apr 2025 10:01:12 -0700 (PDT) From: Breno Leitao Date: Fri, 11 Apr 2025 10:00:49 -0700 Subject: [PATCH net-next 2/9] 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: <20250411-nlmsg-v1-2-ddd4e065cb15@debian.org> References: <20250411-nlmsg-v1-0-ddd4e065cb15@debian.org> In-Reply-To: <20250411-nlmsg-v1-0-ddd4e065cb15@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 X-Mailer: b4 0.15-dev-42535 X-Developer-Signature: v=1; a=openpgp-sha256; l=1075; i=leitao@debian.org; h=from:subject:message-id; bh=gHJ3bSUsNw2+03fX44wo5CdaZHCsae1EVtBp+WMaMGA=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBn+UrTdyBO+OUHDEbodYu7vr1zFIBpr/VNViQzS ocuoPCyaLmJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCZ/lK0wAKCRA1o5Of/Hh3 bRd6D/4rqszsYbQQ5l/EPBDNUp6j2U4JuiyXHjzxx0WQaosGY+icZBEsIeifzrDlFeAa8kYhkap dftAjysdTZ1PlxCDroMpNuDXKWlSJPiVk2NGs99D1jgTOrlZGOhKadl82AC+QbgeULmZhZ6h8Dc WkLPElbBDQThrH5H7Lc8U6W1uuKYEqxZtigoUo9js9V6fY11N5IefuY66YaXUt2/ANTrz5fquac rGmmI3oJ2gkx8m1PQIJ5/ipj5Trv37foj+8q1MxeFNI9/8Jx8eAr3h6fWpT8mbJyfBbG1aKl0yb LmcK2kDZNJUVMBxAwcFVXoY4Mrqk1Zt2C3qBykcdHCxNfdTwbgFB+SJCL99X7awpP7jpurtwlCI eN6aM097l7nuD9Ut9kX9kzQt5IIlokri+49GtTSpDQ3QSaIqlNeVpc4JID+0QwBrrl7PlBMVXtR aKqWpDm+uLo/MroyZ2kdXBGwNSSIi5kXyhagYWMPwMWW47d8D0iiJNt2pMR4/7apclmGoJN3kyC JIfq8wCxCNkV9JrYtIRxq1hQ9JEuQp8e+oSyyVYXSdFIENiRvPK/2oEleTo1uQe45eORsWvcEOX +j1ZTlolt0T/8/EvmPK7DTDOiVUTUFatU2ufYvtjAfTlkmHsY5VPk6ipJJr3P8pfffaOe2fdP4h miDUWqoTdar2oXQ== 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 Fri Dec 19 09:42:07 2025 Received: from mail-ej1-f42.google.com (mail-ej1-f42.google.com [209.85.218.42]) (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 03AF7221FD1; Fri, 11 Apr 2025 17:01:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744390878; cv=none; b=FZYMEZ2MeKdhPLxaQrme8Osw30W/BU6CSNnGaAxXKncdujxdOUkNIRvy2tmNjN6Wu5K602x3cC1lp0o9aoiqZiLHckF/atGuBeV3TgDpa6eigNffhIPyULOtndgFWRaKEmcU1IclDKWzC+FgTRqmoEtUc9rH3idZ724TwGoT0dA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744390878; c=relaxed/simple; bh=jAnjkX4YrOhRhNYOu9uh8jXBzMfz1KBX4pd4yKauKKY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=PM1WFQvCg6dLqboUTmcGs+4Uzml4qHGZKwlOMvaHaWhr+dbcgbux8u/YKgpdpHvvlLL5lc/+4cQd8ymJobdN1K4igTlS52jsrFWd1+8N2EZdxSkdfOv2Zrs6MGPr9UJLffTZXMfbIaBcYLN2BrJAXPuZrT7GGCS5CDwAIgJ9kxg= 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.42 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-f42.google.com with SMTP id a640c23a62f3a-ac6ed4ab410so364924366b.1; Fri, 11 Apr 2025 10:01:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744390875; x=1744995675; 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=fQXC8rdVYEJK5/GnNV1XkDFI5aEgmK+iXihPheDmHow=; b=TkorCZcOYAw+isZx1d6zD1Te1t5Zzb1D0oTkD+6/eYflnXBYwdkLsOBqW+CQQUlHLz LZRBrcN1W+zGr4DyK/gscEI4wTUWtAezg7jFek2DUO0RxUVC7B/oUU5Lqqw6rvPxHQgV w4DqK7upfl6P4lrcEytdzGXwXPbwNwuDuMt/wub9t3ZA/6mKn6zBhIa+rDk1vHYVNs/W LSVzJbjXQI3uB538qYTRPAubwt2RSdZcrL29sUZaTB2PBzdbmFHZ1dWLpDDVQZbC+MGA XilEHhZl9LByYgEutyhhtY/QXyrpu3guz+0wwqLHTjowtza7iqa4M65pVPpkPA0/2Bu0 cdsg== X-Forwarded-Encrypted: i=1; AJvYcCWqWMm2x5VH64g+NobD+RCGmHr7lyZyNowip28XBPas7pF1pq4k67yQqoO/rEPzUbA7VDUoPwGN2VQruiQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yz7uZRgxmZO5g3Taf4DRFHiOdBAhpkOuCyEVaDHut7e2TIh49W6 JnegKM5Bnjf2DHTCD7Jc+iGlPV/wpFVjQCFIWhjWvT/JwfICBxY9 X-Gm-Gg: ASbGncvtb3BHUPEca9/LpoDH/JV2looMPYrUTeaPUdb6OLchCUVRB9uewuI+DTvY0nR l/cFoHrK2h4d8O90KNEx1nunfnpz+yznfXhggPvStUKS0W9exIIUVgb84HEniFHJwIFk+Oc+Zhj 7Io3iKNmm2VvJ0OTRhdG+Suy+jEXYNZVnVzvdG96G+eygsukkSqRRAWuupEjJF0pciJKgDBm7Jk RptOBtOpLitYieQqBxfuxo117i6OOX1mYJ1mLXWr6I+W5DVEzy+0LAgVZlZOeUA7zY9Ka7D4TXN L5jZ95bHjoC4qj+591/uupPQ9YmkxL0= X-Google-Smtp-Source: AGHT+IFTMNt3WGPwQFfIPSjcsNmzwhAtn0IcAk4iI8gALkyrUbqusSigAjgQ5yukEFkCw/8HuQraeQ== X-Received: by 2002:a17:906:f5a9:b0:aca:a1d7:a830 with SMTP id a640c23a62f3a-acad349a005mr350299466b.13.1744390874870; Fri, 11 Apr 2025 10:01:14 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:3::]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-acaa1cb3da7sm466230366b.112.2025.04.11.10.01.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Apr 2025 10:01:14 -0700 (PDT) From: Breno Leitao Date: Fri, 11 Apr 2025 10:00:50 -0700 Subject: [PATCH net-next 3/9] 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: <20250411-nlmsg-v1-3-ddd4e065cb15@debian.org> References: <20250411-nlmsg-v1-0-ddd4e065cb15@debian.org> In-Reply-To: <20250411-nlmsg-v1-0-ddd4e065cb15@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 X-Mailer: b4 0.15-dev-42535 X-Developer-Signature: v=1; a=openpgp-sha256; l=1074; i=leitao@debian.org; h=from:subject:message-id; bh=jAnjkX4YrOhRhNYOu9uh8jXBzMfz1KBX4pd4yKauKKY=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBn+UrUCMtIJyDxtp2QOiuNeVBrPdDHzGNIr/EHx 2KJEdkwcVyJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCZ/lK1AAKCRA1o5Of/Hh3 bXOLD/916eNhYEeo97LAEad4mtf/vppIawkoPOySf/v5pMlFpENgJY7+mlZNEAyajolJg+IdZFQ Rd86aZmHshCLJZKhlkl4MFcx1dVuBR1f68TU9LGGIUQESWPOTVZ3rVjKuI6Q+UK66P/9QDCnuAp ed+YktTnfmfplFLfUfHvUfGAH8jSCn+adgp6CTimnyA2XOnGdwjgutsZacLo1TxI92kfg4p/dRq TTYUsACl1o4xstYpX5ja5eb355rsIuDr4jxF122OORkaFZLjhSHm4Z0KdexBg4NYRgCpPwe5xa1 uB7nfdqEPvKC2pQDZjyAL1psxrm+lEFX9eUfMYbVf36Q4ZqItXeAQmU9uEhHQyeZYtmiiWtBCE6 xN2FH/lTJNiisYW5EmZaJc55S0gI/aAw2Hp3D84NQ+jstQPrI9Kh9MiL06Ymibl2yT72s2XSc9V 291RPlDX5Gdpm/k2ctKyvKcfw/l+mdIVoKjiWkTJjnLO97G3WFLWV8YpvnGd3vBx24a+pODSsLx JqduBtLhxlRA9Rpv8mGp6zld2UYNOnX6R/K0lxf6U84TT6auOBFjmDlR9EqGZaQ9YKmdCiFxSD1 gqopD7yb+nCOcbnWBoLIx+4zz1TM8H1U/ziQYJwKZLyGNwRUDsuB3D7VBmlVtpIOYaUb/+a6ZZM RGGSwL5aScOGrOQ== 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 Fri Dec 19 09:42:07 2025 Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.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 BF0FA221DB2; Fri, 11 Apr 2025 17:01:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744390882; cv=none; b=MtsiC4+Lr6J9FX+hijY3KqbwxWmDJfwowimjCRrApdLZhaURc85aHwsz5loqr3bf9/L5RAgpeTviky7lp2NG1sHZrfQSw9t7Z2ABnI2SQRGNx4Xf2JtFHNcVoskgPodzM5QW4WStDCsASK+i5YqoYQIPm3amEi3CX1xiJeaf9aQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744390882; c=relaxed/simple; bh=Jl1Jg8xNHOI4OK1xiJ1wJZ2es8NvAYy656lwndBWZJA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=XP4k8h0Dv6ahfqxvreh87tbYYrpXzlOdDLcwlJBIrAGpUiS3Pjm2J8n5nQozOtOENtmNib66+2eih90FFdJQLuu7Bw0QJUIAlIlOa46z9EUQuakks0jl4UnsIobaGgYuqse7MA89Yn2883NCmFOiIF0WLzDmzTss7GsutFJ0hOc= 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.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-ed1-f52.google.com with SMTP id 4fb4d7f45d1cf-5f0c8448f99so4489538a12.1; Fri, 11 Apr 2025 10:01:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744390877; x=1744995677; 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=hjW+JjoOHsvH7l3Mahbgsn/34UGIGL+Ev+ltWUAL9eQ=; b=Zlz6yqrvYFKNxGh3PVDIW2x0P5W+sneYRspFA40oLLGTS4jLyLXGOnRBh5F1IAb9eR YlRhd/vfdd8e18yq4GvMS9Fraz38IXMwXYUU4ymi2KAz4+/nh2o8BL3ddmvxuifEPC/N Dnf4UWidqZZYP0k3HawIBEfi6cRr7mJqKtnDbIxIGOq/eP1OaAzb3Bf8IZO8vuUP8BmO zddZPe9Ax5rkJKWo69fZXYJXZlGZgGKAGZ8d+zKpg5AhpEesTUbtMr490KpEMA0Uzb6D +R3nNR62WSyXIHC9rDi/53IlVtvh30Lg13yqKbKKlY0nVELJvWV4+hUdLSWrjYCUuMwP iZFg== X-Forwarded-Encrypted: i=1; AJvYcCWrR7rjAl6b+W50Xiov5UPvgzX6m1q6E0wrwbNZE9VgOJRDTVGihioV/AYEo9zTyKabMOgO1UGz4ldfMYU=@vger.kernel.org X-Gm-Message-State: AOJu0Ywp+vlwAexqnWbt24vDq7+cD1rJB1N0GSB+8Qb6vOLl6w4vsBr8 VlKkX5VJPHYrFTOE24md0wWY+YWYNHm1ISq67XjnWter5OvrdUlH X-Gm-Gg: ASbGncurTdfK2scG6YODGQ4X3p44AntdR4ANiv9IRkBbV+/A1bu9B9r1dGSnuvVyJv6 Fi4VbBnR4Szytio1S4giqqLy969311FzQGneQBrEaKkx2m1YlZmDxcoP1Y3Bjj9gelWdONkPoHa eKeO6dvMR+uiOxuOftKxXFatrDOh/4COrmfDf6Mnegg9Q2gSGn9ejXfLuWleq3KY8Tq7DDvCoih XGG14Wq8sJ0lBXcDiS0s6p4a4pF4rKiLiXArK4Ol1dTtzsKgKQchIvxjfR03wR3r2IVCyqoAEju oOUUvIX4oWfej4CqsfUefjoSSTi+DjU= X-Google-Smtp-Source: AGHT+IFpaJPhU2bzSnky9/L17bHdlvHEFKtZ4lDqKgvrNAEVCmFdTt0hcs3VY+DhBPxsj3gZIXmOSw== X-Received: by 2002:a05:6402:26cb:b0:5e5:bbd5:676a with SMTP id 4fb4d7f45d1cf-5f36ff04a05mr2783352a12.22.1744390876546; Fri, 11 Apr 2025 10:01:16 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:4::]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5f36ee54d84sm1228361a12.8.2025.04.11.10.01.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Apr 2025 10:01:16 -0700 (PDT) From: Breno Leitao Date: Fri, 11 Apr 2025 10:00:51 -0700 Subject: [PATCH net-next 4/9] 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: <20250411-nlmsg-v1-4-ddd4e065cb15@debian.org> References: <20250411-nlmsg-v1-0-ddd4e065cb15@debian.org> In-Reply-To: <20250411-nlmsg-v1-0-ddd4e065cb15@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 X-Mailer: b4 0.15-dev-42535 X-Developer-Signature: v=1; a=openpgp-sha256; l=963; i=leitao@debian.org; h=from:subject:message-id; bh=Jl1Jg8xNHOI4OK1xiJ1wJZ2es8NvAYy656lwndBWZJA=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBn+UrUWBAQrK8NwdsCQqV7Ma4ZAXBvPtyybnnFP /qRjlpYkjCJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCZ/lK1AAKCRA1o5Of/Hh3 bWzMD/9hH3f03/Dj7emGaBBrMVd7VrKjWOhZ0IHelNTSnYMRN+pm8ShqCPixLzKqXTQ9T2p09AP 7L2a2KDTv3H1tBB1oaF3BAsE/QypB9VwG6l/MIfEvO39aQtzwa5KNb+DVj8TVGYZhLbwMhDCD8r uSN8VXdtslyJrvYvy6ipiW9YyOHrpYS1nD6zLBohw/G7K9wSG7e0t4/gQgYB1fiRgV/wl72xOx0 YAFMbTJMO1x/GErxtiDoOL9aXAyPvrc8lbOtbRkGReOaPN9UTzKwhqfGRXcCtaqhzZaT7QTDyfm 142Y5CLJqc+v7piWa4uubZm5Tsq19l/KoFzPH5tPgD6vRKHI4M8L5kg3UOH6pL/9QvlHZbg8vwQ W295FobL/S1AP/eSgZhd7BrC3lbhWMxf/CIB+XZe5Y1NfQTw4U9Y2G6UTOUZGKL74fWaCe9gdTy u/C9txmdKjXFS/Jf5FWW1j8m5Tctum4XEe1DBwjPbIj+sfkm/cCl7FbTAIw2X7V8Qxp9l8G72d3 XS8SahGSGveraOKa2BNxKixelFERTxNjnTMyqB9PSVMefduKCk+6kewJJOxC9R99dp9o8fxIhT+ Un9v3n3tcKTxFVK6kbKjtsfef6GQYlv2Jupaf+f4FcrWbaOWBuRHUwKasWZIg8GT2ln6R53ol/0 HzWYIuReelI8Z2Q== 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 Fri Dec 19 09:42:07 2025 Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.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 97124221730; Fri, 11 Apr 2025 17:01:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744390882; cv=none; b=koUVuHGnsdkaLPq4D/TkjG0HfzP0dTKpjjPPd0DmoShWEPtRUaovaKKgx2Bl3MNWhEWYXDFgusiCfSVgugDRMx0Nazqoor8tm8N7PTk2e5sK0cYHFnWthnyLkJNiqvmXf8E9uXNb5PcpSt/QcXXNs+35nTsBVigyHs/j2jMw9k0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744390882; c=relaxed/simple; bh=LkKbG7mBW1nBa3rIzXBPWQRGLBKmqnkuELzeBvOUWsw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=YeNcvsjCtv0CKLRkWARvWeJBEg8O0vpJfur551LGwfbVsIC7gwweFSfEZULVNR7WkxLcLlddyEVQBK3oIDeraYyGS11bj/gbi7hrnGsKXRliMFBnTfYwBJQAHwwp5zIJi6g+TOBoDHWEtUzLIVWtgDSEzFZcOlQ0iUgKgkG31sA= 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.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-ej1-f53.google.com with SMTP id a640c23a62f3a-ac2902f7c2aso373527266b.1; Fri, 11 Apr 2025 10:01:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744390879; x=1744995679; 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=rQJdK7pWNGAO1N3US6hhCsS+d/YXVzKHaSs7dhJL6eI=; b=JYOvkjJ1PGcwjYXICK2BQ21iZqVwNjj41QZ9DX45xKxAV4uuMySSKCDVTWT8vtohVa GH96sqDC6agZvOEgO3wYBsoH7Ot3vaOujEMXTAlGjdtskW8T1c94EyHUO+UeYFcRLqke FlzpC6a41Q5s2477H7zicCnx0xPg1TRiYzhIs5y9owpj+Xrg9lPWiEYzoVGG8sfioS8k Cu4gp0nkd1iMN8TuCUP8+m+XjXpEFH6LusPxELY/m+vf+EAiYRrnvdCufasbdy4yi008 xO2stNV/EAoOsNsT3yhgnAWmOjSRhL8SHGfuq2ha5Cj8RIbjWgvrua/wKPNNqIUHPHDq K4RQ== X-Forwarded-Encrypted: i=1; AJvYcCWT+R5enuMG/7XnysT/wNXXk+jgfV6vyxK22420mOIpKzUEJN+PHJ01VwZXskgUqa/JVtATC5jRFcmUUN4=@vger.kernel.org X-Gm-Message-State: AOJu0YzpprCCdOs/mxuJ4aChS9Whlyy6rIWRGe6K7+7I/UK1p0ME0pVw XxXVszOi8tDmhVlZtwKwNSu6vkeX4aVa5/2vyvfSpj5lbmfjIRCm X-Gm-Gg: ASbGncvT4kF5NfRn7mXKJRd+hOhtkJEyv4cH1Zb9UDfXveptipllzahNVEmReJvrc8Q +kG163HPZ7X6gzUpAK1LdW8kQLN4DFLnotH5qfiB8nYb2FeLyeltz8OxOoz9qEkGJ4vhbhbR3A+ XkB/OO/nBsCFaAkKGoNFNFhhJ6pMw+LWTzpnPanr0siMFLhyyBvqz8nbvzeTvC+xkmnQytph+X+ Q6Jm9lU0coHOFfcZmB0/36bEcc5bMRPccqQFRd5rPo5llg4wRBe/KAstcaMOxIGhqDyFhdSKLHx 0gyurSQbjhhY4Fv1G9W7f+ziEE/QF6W9 X-Google-Smtp-Source: AGHT+IGEAP/y3VxuIYYyHAM+9ZlDagbzQCkDP4bFRg5FhVudcEXAozpCj8kZi+6xHWOVGsW0earNCg== X-Received: by 2002:a17:907:d92:b0:ac2:af42:4719 with SMTP id a640c23a62f3a-acad34960camr287700066b.21.1744390878360; Fri, 11 Apr 2025 10:01:18 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:43::]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-acad99c4456sm82905066b.110.2025.04.11.10.01.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Apr 2025 10:01:17 -0700 (PDT) From: Breno Leitao Date: Fri, 11 Apr 2025 10:00:52 -0700 Subject: [PATCH net-next 5/9] 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: <20250411-nlmsg-v1-5-ddd4e065cb15@debian.org> References: <20250411-nlmsg-v1-0-ddd4e065cb15@debian.org> In-Reply-To: <20250411-nlmsg-v1-0-ddd4e065cb15@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 X-Mailer: b4 0.15-dev-42535 X-Developer-Signature: v=1; a=openpgp-sha256; l=953; i=leitao@debian.org; h=from:subject:message-id; bh=LkKbG7mBW1nBa3rIzXBPWQRGLBKmqnkuELzeBvOUWsw=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBn+UrUM3ubDo8oz3MedYafDsVqjXYw3iV30IJIV NnsT0GOd+mJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCZ/lK1AAKCRA1o5Of/Hh3 bYAiD/oDtn9YbF8tLeegy9qOTh93EJIh5sVQuVqQcG2IXGaWXXu0WhbtD2X5JW06hFN7EYKHo2s Fco+fa5RI7amoyITt2CucKMitlXCtAh0JUcbZuxFt2Ssf2SWK/TM6gvS5QVU+8Dnjd2Y4feDXHz 7fm6Liz1zbknLcaF3wLrYCoCUbaGUN0TmLqQbQneL/vx2j1xVvRwpt5rIgN52FIhfKgw2RHlIJ2 eiyabDqotJrrX1ZUBXnS7ybz+JJ/RFPGnD0ksysaAWJC7VkCCcVWUzeJ31wU6slmOE6urIqukyS Htws5QiAp+8TKv9PT/Hl0fFF9pwFTzM/Q1Y7CKxRCQlq+ZzIEdWq0XcvW7P6MnBgojPUg3kEuaY pwJNVO205ETC3NBI4jLGT35WCttBAjLoLCCKsadBgReotfJuLFi74Jrx9V50bWqIGOpP7uRy7GI LPVg29lFFSX8LCgv3omlbRyg2exQTGHsErA4zsNY0xPGvvFqqgk00SCIiofx0g8H+8MVPdRyH3G 0+sM7izNiX+2P4XOvrgnmyMANfzbfGpTdCgTvoKOtVUuBRmGneoBIt5vP85cWYF2gE++yHhXnpG GtTTyGnSmsrzHjTG+J5JtAHpjM3/nzGOoA+1w6Zw32F9cMJkBBICZsPjuzPk23jtckl3wIAZIvG GIgYLCqSvRYFSwg== 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 Fri Dec 19 09:42:07 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 1F152221DB3; Fri, 11 Apr 2025 17:01:21 +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=1744390883; cv=none; b=swN36PzXqvZFhXNKhZl/63LFeWCDHzTf2TxPW72GTJYAb1dKtzzpcmXxxbOxs5xdpfQxlH6yy8CgLRHtx0yIXk/ESMn1O04PznVyJq6JlhNWq1D7yRF/g5LTYyQL/WB5uM7iXlh9RKygst5sQ//oL9sJIkUiFAcB56bJlZoQu2w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744390883; c=relaxed/simple; bh=YhXmralQOtAPpYDtC4QwLXoEtDNTsD8hV9YQs3fVBoM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=R1deU/vsLZNL8Ej5ANkpTkn2DEvOFHkxI4BgQH+VShT3oot0HU86Bgj6gD0OyoH8tTk+l8HF6oESRf5Ck4hISvod8X7RbQs2VK1SwuL51prmuC9hwIIngrhhP9mbNamALsV9unYIzO9gBetr369x2Ov8rGvzKc/YB2XCSB3OHCA= 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-ac2bb7ca40bso421084666b.3; Fri, 11 Apr 2025 10:01:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744390880; x=1744995680; 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=Nf6NpfxcWpwIeuGgKz1e73pornpa+ar9renqStP+qw8=; b=dc7KYOHUh4YrNkhva1/TQADBqAhTMS7fZrodlb3CUrelijaTpxqPV0QXI954wmM5zd DExpvNWfWhE6YooYcmrwiO7DrahYWOMnhhCyVB5aeML5VRM8rAUTsmOnFWPzJduPPww9 7phzf0S38EEpSm23UtUGkOCwuRgDpFc7lo1/jP1RSy4w9HXRsGxJGFUhWh9IiQsLQvO0 CeBeBg+kkm0QLA/M2a233n3D8u252OkZPaayuhoo1Dwlg04jzSx0rbz0C8EVFfG3cDuW m8f3n/7NIt1GLaVFWOI05eCmByeFYrF5I7CfZlyEL83hk5+taBkBdXWIQrEcPklXTkc8 E//g== X-Forwarded-Encrypted: i=1; AJvYcCXSdCSm6BVbGB9F6pkIvh41b+cwUyCpERV87tTz9veu7RUzwH2kKwPDGbfhIhlSEFPe7lH7qDAvfSeam9E=@vger.kernel.org X-Gm-Message-State: AOJu0YyUSsKslrw2wnPB5oWfMZBCVQbuLsWL1qMSreo4H5o5D7nn8pK3 e+X7bVRiRsjuy+HURwKo+Gx+FotcW04U8wKN5cRtoVxJoo1W72JH X-Gm-Gg: ASbGnctiJuiCC1skMtZHeTLy5Pc3hDoiGAAPAzJ83MkmpuQgGEMZb8qAn5lLWDhGZxc gExxZdtyiFbj/wN7lTJ7XVETb9tlH/UqZklC4emyilf8BI++9cMPfrBchgbh9cucmr3rXGtkFTt Mf2J/hf4QmFL03W86HwE7Bhd6Km9kmctgGA7rmgBshtwVoFCHUJGm9SBzq6sWuEMD5n+2ftxEmE FGUVZIvQi96Tggkd/iSswK3ihfFA9KomzKf+mYfQg5TmQWYZlGwUZlMTGUp2hp80sSPYAjTDsEZ sS3Puc8VU/msbEmBRR8yZQGCKGgflAg= X-Google-Smtp-Source: AGHT+IHieN7cXEy9VQy2JMQ5xqz9oZqORh59JNBosqXrv6VH6DH73K16LG7PwMUgyjFlpVqQ55Fq5g== X-Received: by 2002:a17:907:9496:b0:aca:9a66:9a2b with SMTP id a640c23a62f3a-acad36d93e8mr294702366b.55.1744390879980; Fri, 11 Apr 2025 10:01:19 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:6::]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5f36ee551b3sm1195429a12.5.2025.04.11.10.01.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Apr 2025 10:01:19 -0700 (PDT) From: Breno Leitao Date: Fri, 11 Apr 2025 10:00:53 -0700 Subject: [PATCH net-next 6/9] 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: <20250411-nlmsg-v1-6-ddd4e065cb15@debian.org> References: <20250411-nlmsg-v1-0-ddd4e065cb15@debian.org> In-Reply-To: <20250411-nlmsg-v1-0-ddd4e065cb15@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 X-Mailer: b4 0.15-dev-42535 X-Developer-Signature: v=1; a=openpgp-sha256; l=966; i=leitao@debian.org; h=from:subject:message-id; bh=YhXmralQOtAPpYDtC4QwLXoEtDNTsD8hV9YQs3fVBoM=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBn+UrUUCGu1LDut+UaNrtqlswKL4aFTKq9Ls2Qs NvyAR0D1nuJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCZ/lK1AAKCRA1o5Of/Hh3 bRvVD/9lZM0pCx3p9i+vy5r1f7yyO7KCNWYqTvo2IMwJxeBXEILHy5fV62MEMjCCdtP9BYpaum8 qEKQhGOFqw69n92o5cHE7Qo0MfXOMu0IOgGqgGDDHBlQqN9Bk6J2pakOnakCW+FAe5UhoN9FbtB 4zp76kP4NImKZ+agzooBQjampKVpzcY6HYx3obWp3iEABCUDWz6M5lsmBPJtAhMCP76KgZO07Mo rsoVRkYW1uC5EZj7hPxeJuSzCnUzW899ISd0gd3MGVlxycvIri+3r3zJg2XYqRnCe+jUwwthTfP /6zaAVCssHpIdjKXx9TOdO4H5dsE+pT1xYnOLc4uiuehCa6ypURii/AmrV0ejNSYp2D8kO/Hjm2 J34Vf+BnQIeJ8b45e1pUfcyLly+g44Ff252+4BlCm25Euu0qrHXrRnntNiZo3qT76ueYepsWC6t 7iOU0caFnWt+mTY/ZqJUtRSb5KlE4GwpJNFZ9ntvdypNnW6ztQl/uL/J1d+lFrQffnneKPhMmwI C4GJ/wEJ4dLgH6XRKzukhSQkd68sS8mvuAb63lQ9gMS2WqoDL74HpVm3G9XFHNO3G4SxQFzGPIG xlhsqg0JUfh+QLblWhmEe3uN+dsxllhUHZJmgipg3yz/okNj3U7z5pKCHVHbRvG9NEL24FNLbLV gmpKZtxqhRyszMw== 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 Fri Dec 19 09:42:07 2025 Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.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 D82C5230BEF; Fri, 11 Apr 2025 17:01:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744390886; cv=none; b=kqb7iaHS8usDglZ2RhOhtI/1pgNl5nyXNqpMtktzp9hvEtNILGPZv8ZUvdzRMPkVAzkSAqxjg/+3Ag1bZK9CJdThdxTo75CficSZ9usNQhj59XFhOgruqu2JoiWw5KSUfDgPF05GqorAor9c+lCCD6+g8m9SHZJc6+5O1KJs7Fs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744390886; c=relaxed/simple; bh=U/T93QwYmW4LdhpItUWeHJopZMmWtikVPIoipOrWDR0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ubTxtrwmQ8lUpKBS8HOvxR3kJ/+zYo4itKjs/igAWMnbj1MH0G3v2vWdXPeQ+3eyjojMBWL/luEksnINHqJAvgwbshsiskZV9DpfipFbi5lLSr071KPRzHPtJzRquW6P/rc/J3UDpTkpGk/d3m1+ArDqpCMB9F1yQmOtY48t5t0= 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.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-ej1-f53.google.com with SMTP id a640c23a62f3a-acacb8743a7so236008566b.1; Fri, 11 Apr 2025 10:01:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744390883; x=1744995683; 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=CfYr4DJDfNlnUipi8sf/XlvXzSj0Sgr2GuiXsiInMmQ=; b=n3vWRk8WH5a6Yt/yA+cb2JhOXnoSZXqojWNjzjAmGBuTe18CfXB2/RXpL+nlt/kABu BkpcZX1NiZGUYxSGEIhFnUcE1gmWVnwJKoCJmj21EFV+sy6ezIE2ucw3ItucH/R8uMyt lLhnNdS8WG8pQ0/8wkyNLTAi+/g/GEBSaOivFvh21O1w7BMwE80G7WyIYLZWbIUWNP85 L31DfkxAtXSis1Gm+ixRC0jUuK8t6G3AhXDhE2vRRJ6SOdUmNK6D2cXJuSyud65j+BWl dTLeYrOX+F74JdgQsFpdgbLlX0zLljLxAwZGf0VbKD45DBEbYrFnhUs7AyUsHSqmDQI5 BQBw== X-Forwarded-Encrypted: i=1; AJvYcCWf2cEtvKEWg2/u3YyAKSC4e13l9B9e4gRH4Uwuon8h/oVVfDGxyqW+xjL2gr+h6sp9jQI3mr7bg1TnNQ4=@vger.kernel.org X-Gm-Message-State: AOJu0Yx42joIXM8GlQjS4aYuWvaXSZ6P0CDn/kO213XkPyyu35IELm3K q7OwJeE3iSluKs6orFu1tQ3cV8Yzg3aGU1OjZp8pGTHXCZ9WQCke X-Gm-Gg: ASbGncsueLc41ytHGf6jhR1VACDTZoLuIcXybaoYUgHuP47gn+wHhKlfqFX/6Z1I1WF HZqn8c2/ITMnCdqobECazrWSgw12WUEOfAXx+8UGFJqaOVh7mI5oonrOCGc+81GztKgV8sDmiXi TKFWcxGr4wTzvmUyEXqsUS0JzAvpcYZvG14ru/XU3QAm54Ztg/q1zZZz31yeUGEq5cQNxhcg/jH 8MZs5XYZg9vTRfmQRIqbc/JOXEj796tmTXEY7jVGBAwmot9tAlXrFO1RlUbE8DswJiDzNetl0FO bO0+nLHpCEm935s1RwsEj5MI/J1XgwG7i70lXZ40sA== X-Google-Smtp-Source: AGHT+IEoKziYC92Gi2BJj12QlXJ5l/czgRr6F/9lwZAA8RfFO8aTiEgMIPWN1bPcO4o+icV1MxftaA== X-Received: by 2002:a17:907:da6:b0:ac2:4f30:5033 with SMTP id a640c23a62f3a-acad16a0e48mr351376866b.15.1744390881569; Fri, 11 Apr 2025 10:01:21 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:2::]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-acaa1cb3c64sm467685566b.119.2025.04.11.10.01.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Apr 2025 10:01:21 -0700 (PDT) From: Breno Leitao Date: Fri, 11 Apr 2025 10:00:54 -0700 Subject: [PATCH net-next 7/9] 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: <20250411-nlmsg-v1-7-ddd4e065cb15@debian.org> References: <20250411-nlmsg-v1-0-ddd4e065cb15@debian.org> In-Reply-To: <20250411-nlmsg-v1-0-ddd4e065cb15@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 X-Mailer: b4 0.15-dev-42535 X-Developer-Signature: v=1; a=openpgp-sha256; l=1143; i=leitao@debian.org; h=from:subject:message-id; bh=U/T93QwYmW4LdhpItUWeHJopZMmWtikVPIoipOrWDR0=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBn+UrUoHm11VmkP5Ez29RSOqNOg4ctvXATXOid5 4m1dXxYVxSJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCZ/lK1AAKCRA1o5Of/Hh3 bbsiD/47LCVVA5ZkLVFSq9k3+a659MYGxmYdmGmkkV0lMeBW5uKU3bcbG/cfykpIHZJPzN2JYS0 g4UjXPpJWLQqgvb/NlPti6beyQUoGQyJfJgsMCj6PqH5ya2y10YfV8VLhR9csG3czhtVXcb8xep 5fOSEKW5iAw5XlKi8QCNWtRzq5Ruh61TF0Y8OyMLLR5zAYLJ9AUpkqdimqSpkQFx0J1HvfEAFGu BlRgPkN5oygJy+CjfNO97wc/tNdQ9iLH9XdxSJwbeECl89gxMXBtEvs1IrmiiPc+DwMONEUngIt oi2MhJH3iSyGcoMvjONLk6fT3Nj98tTaoZTfDYkepIJl58gAjiwrUs7ocH7bGSsLH6V+7T/Ayjm VQQds2llXMIFnzbq+IfKQP+2FfXgbwxCCCM0T+3/DY8T37tSZyi3PdAX2rBKbI5CLpXyZkVMpOV 5Jh1M0YlGOGmRP+83EG56a28DEE+vs0WJTnz1IKy/2w2ATwzYJ2JAD8QgGE+K/VCv2E4ycyzPNg Y4pSOFqEv7KlvyQ6uX1J4xlGJUvzCgfxa3KIXbP5zWSYEPs5Ju8zMKJQrhdnz1XJVKcEhS52tml hQsUHp9xo9rOIh152X0OJO1bLzG7iBifx2/gqnZLYo7t0stjMsv12nDFwgXIMY4VIHEuiXY1eUR DPeNw4flNLqdZbA== 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 Fri Dec 19 09:42:07 2025 Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) (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 1061F221DB3; Fri, 11 Apr 2025 17:01:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744390887; cv=none; b=QomRK/DJVu+b9rivXA1UbUQIcnXhlUwmxs/esp6uLUpxRlIDA3cEOBxNWhQJjFymvaYXnH7qXUu69gVwjTwn6b/ES7M/rC++TruKaEWr//kOfZKhAr4BtGNZ1Z4v+0nzy/mkQHyUNiAO0AjGQZam2e8TAMGsgxU72jb6/YX9FK0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744390887; c=relaxed/simple; bh=lYvzTpSZyygHUXVEDNzAsKHGlcw+uYdnaFaBQjbhfBc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=A/fucaNWyby16oSMN9Hx8GArZKvLnF3naaSs0mRTVLUH8+gf3PvWM2ef8MHVejmbDUewgRqarrJPI7ehvSHLCXgUsWO2hiqNVo21rCSMZh1w6IIt77Xc/ZDaz0r5OAZSax7wvUs0UYwKz2avJ1EqVlSCHxKoqjFzP6mHvzHoHOQ= 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.43 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-f43.google.com with SMTP id a640c23a62f3a-aaecf50578eso399322566b.2; Fri, 11 Apr 2025 10:01:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744390884; x=1744995684; 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=KFpqeny572NR+EIPAKNoxaM60b+BChL2Bxy58MvuFdQ=; b=VbqBrDRrf56+nPVXrmkkLtLb5x6YHEX+LXFeW8Ow1Rnrd6ld1eFXW5BeSoV9LfeqV2 EwJ6gp+nttnKlzGZcq04gnwC444veCKpVVJovtQr7KGN1fkm5+Nf+X1EMPfNndUc/tm1 efNFYojfd9muE3oXheW3MPBqe7j+rA7y8Zh1s2PY/ABeD5snV2a3GPetbdwcav8Q1lG8 rVd4TxVlSHic8CRGrcqBsMuYzKWGJgcI8sNyqsB7lmZu200nhc0a/g9LLwU+Aqn9Gb6z MU9H7YUmmRvyWz0qz/0eGnKx+EV/W7zvZOZ3y1+ki5IjC6+dCssST4E9W8/M1g5QG+mu 4MhQ== X-Forwarded-Encrypted: i=1; AJvYcCWj2neC7TkadY/ICTwGfhxKYx0SDUlpLPk1lpnSwAlunXOVY/CM2lyoOgQEUuRzAdg7985+9q9ubOZG2f0=@vger.kernel.org X-Gm-Message-State: AOJu0Yx4JyT+AGpbkq+oogMEQIpRlmruM0IWhNs18/Ahsz1f1Irvkrj2 b5bGxLO2FuxxuQFjrqut6TYge1CwFjfrWW8Zb1y8DWUwx/tZlGal X-Gm-Gg: ASbGncuorw3UJlIBmVFT8KEz2mB0Egg12WxfJLS+AHad4Lu3koUTX6SCxtXVkyv33sg ssTMqWx252TIOFERYtuAUo99uAQtHTfy+QPSDn1UnWt7GMnXWQespIXbhKicagMh6m7LHuULV+R kxIEbR7xovOogPJ9LdYzpq6Rq21EdRljMyBkPy3bWcs5n48nk6kNdLu/haAb0WJCnoK+W92FOTj zfLfKda6V/lw/KwH6TFgbF44NlR3OUJ69eBti5SZSjssd4qJEmPo5Mm3wNMqDoh0LT4KKmpOhqc mLHbKw3cYM/PgDfpNHNXW/2yvcw16YLNaWIS093roA== X-Google-Smtp-Source: AGHT+IFg8ifYnWwth8OKuqZKSZ0bcESyagIEiarMOsPQA8T88ixfnSFv2fW3sz8rQqECW+MYeiUuCA== X-Received: by 2002:a17:907:3f87:b0:ac7:eb12:dc69 with SMTP id a640c23a62f3a-acad34c62e1mr292057766b.28.1744390884043; Fri, 11 Apr 2025 10:01:24 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:5::]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-acaa1c00ea9sm472313366b.76.2025.04.11.10.01.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Apr 2025 10:01:23 -0700 (PDT) From: Breno Leitao Date: Fri, 11 Apr 2025 10:00:55 -0700 Subject: [PATCH net-next 8/9] 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: <20250411-nlmsg-v1-8-ddd4e065cb15@debian.org> References: <20250411-nlmsg-v1-0-ddd4e065cb15@debian.org> In-Reply-To: <20250411-nlmsg-v1-0-ddd4e065cb15@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 X-Mailer: b4 0.15-dev-42535 X-Developer-Signature: v=1; a=openpgp-sha256; l=1138; i=leitao@debian.org; h=from:subject:message-id; bh=lYvzTpSZyygHUXVEDNzAsKHGlcw+uYdnaFaBQjbhfBc=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBn+UrUhYJxwtQsx7VL8rWPoQ3PdTFChRtQF57ed gAV3iu+FKyJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCZ/lK1AAKCRA1o5Of/Hh3 bYEUD/9q7I2HJA65wBHcKXNiZNagmhx1BeukU7jCptuL46ITj9gRPqg0RCU76Q/ZEn5zijSWpiu JvwA+zbNjd9palCE2z9Bw48bkc1mA6QXnDTowN1NF5YoD4G6camtR5ZMaf0brPFZ+VmouOqsEv5 she/8lXiooEfQM1RKPvgDWQBwMk/ThNpcUOHi+XKblbwQpfVIAmrDptPcNWuUgtxwmhq7obZ1Fn +J3QFY3H14w6AkhhAhQVz8HMdGwlMa8hjZP+5aOSiQgCUb9rj8j4gfmoZjJpZpgkOAw9oay12Qf vqERcV89Loy1JNlViTn1TNip51cqpQfuyCXAgTwTmlEuq7UB9CJYTyK6FNAJP/4iR2J3CVPDK42 mw/JHF5xO6KEf9/9wO0wHn3GvAsD9qgA2yKVN9egZac/qT6zKw2YBVLlqp7SOrLRwnDo687ntKk Q0gMH8qq+Uu+yV7Wy433mihnbmls6DEoPmwB5m7Lz+2TqxgfMwJUoZ3s+wWFgDV+mkz25d0W24t u/uWQz68R6nDCrsH+c11ywqWa9cLzOeW42cn6kok4/CC9F/IM+5ZaXOC0d7hRQRoWaMM2Az4/Zz xj0y8ajbv5WJ8ZddcAHDQIN5pPB7WEws1Ho9xcX9SUsB6yOxjTO9OwFtlc6buqXXcWMuNIQEcFw 487UE55KNXkyspg== 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 Fri Dec 19 09:42:07 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 951D9231C87; Fri, 11 Apr 2025 17:01:27 +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=1744390889; cv=none; b=eXt2l1sRskrdcBnExo+yVwZN9w2AfcTXpTPUyoeBF7Gv6G3CKryc8YTTghJYWXJ8KpiyNibZn+UlC1Ccq68UyK0C05pVj4A8ZBczyPqrhZrI/sD8sff1oPQVEeyukUIVL96kGM3H9yNiWrMSUnsny4kIEGMqqtIyvKDPVq+x8k4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744390889; c=relaxed/simple; bh=EiG73+aTQE7S/MDqcWls3yhcJw/iCgj/TzJM8CJcM5U=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=hUhvu6k+zAev77C1Fhy7thWl0sxeIFWeMLEKVegyCg8s0/4aSGq8holIozosb8Bkc9E4+QQXPfHyVR9NpEu3jSMDfzvkIkHIGJ8xct14k2xybe3oS/9e+tUOHjRUjw1PMy6JlMvKzDDd1aKxHbNmcyhGP13Nh5TyRJ0zI/D2OZE= 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-ac2902f7c2aso373542466b.1; Fri, 11 Apr 2025 10:01:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744390886; x=1744995686; 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=5UI7p33S7vZdXBZmDGML1UutPV6e0+OcpwTD0JMF0uw=; b=QSYqenM0x0PWIwiX9/cDV5U2AoWJlXspTf9JAFke/VnwLddOr4suQg9t65+qKR4wmj pds+4/XZ5ZUqR35ZkilCc8DDbQhbYrXm5llAuWJoTEoh/FtiS+JCQ13wkrBUSSo+IcPF SNEYRgo9RROJFrvdjYhIbWjuakz88U+2hEOLKE8bxaKEmTYj3cuNmwpBgekSyt8DUYkH ta0Cw2aWf7eq1yPWiFFrGyjrXBQr5863P/m5dP5V+x/zrWFDY+RFz9ZiWLrJPZuLO9sF 1UTm9SYEaCYTNfBENpWnmU3ovBedaqX66z40Ob4G4N9p8WTuw62XSIxeK20qq2M/5Y6y qcnQ== X-Forwarded-Encrypted: i=1; AJvYcCXmpil+a6lEK9uuQcxAtdbSw7KjipfwYg/8rkbfa/9ekokPB1N61suAtgNnv2wm09H63eTCb3ws0ONTD9s=@vger.kernel.org X-Gm-Message-State: AOJu0YxihQif93so6+Z6XHKiA5F6fpI3LDXbMGwabo17f+kqDK+hpwyq vu5ZHi0f20a14I1CNU1UqS8Dw1CWnOaj11GLT/Ti5rhrbPactBds X-Gm-Gg: ASbGnctYADIjhrTbz9g92sTy5s5uN2NIR3c8FGT1uejzmGQhDXSOi40QNL0PtZE8VDY df6JcLtEXYZz5jP1bDjACpR15Ws0ZhQsYAKCoYkM5546oJjockOVueF5N3pUk5VaiBYiThfolQR pJ6hT3GbgdH3tY8rhq5xqd/tUZQq/nlHTK4sy5Q3iH763WnL++9PcwQRxfEwErpKpm73gPH3lGm GGsr9MDCvqVOj2bprorebpaqDYa8TMZ8atF2hg30kNvqbajIanLTO0x+WCA/cJkxza3MT/hT+TZ lGURMxfsJeLW9uriOTod/4UD5+/3sml4 X-Google-Smtp-Source: AGHT+IGFheNQw47GZmDm459hLRHGPHNCsO7bexNsum73b3cU4B0dDNZU7rLTWcahTtB8zM02x4etvw== X-Received: by 2002:a17:907:3d12:b0:ac3:17b6:737 with SMTP id a640c23a62f3a-acad36a465cmr327371066b.45.1744390885717; Fri, 11 Apr 2025 10:01:25 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:73::]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-acaa1be913asm461984166b.47.2025.04.11.10.01.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Apr 2025 10:01:25 -0700 (PDT) From: Breno Leitao Date: Fri, 11 Apr 2025 10:00:56 -0700 Subject: [PATCH net-next 9/9] 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: <20250411-nlmsg-v1-9-ddd4e065cb15@debian.org> References: <20250411-nlmsg-v1-0-ddd4e065cb15@debian.org> In-Reply-To: <20250411-nlmsg-v1-0-ddd4e065cb15@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 X-Mailer: b4 0.15-dev-42535 X-Developer-Signature: v=1; a=openpgp-sha256; l=939; i=leitao@debian.org; h=from:subject:message-id; bh=EiG73+aTQE7S/MDqcWls3yhcJw/iCgj/TzJM8CJcM5U=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBn+UrUuX8oOq/T1XMwMZLWcMYmbmdzdJ4+MYY/N cdSv+7ju6KJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCZ/lK1AAKCRA1o5Of/Hh3 bRwuEACroZ9Go2FzGXLuZooufe1Uq/n8S479BFqm9VqpmNoqvqqwK5doxtKL7FuhF+j4qg6IV0P pTIy1RCICqocTLMII08Ttn4/zDIdfx7k6JdZaNystX4ekjHXSncbdb2ZmfqFTztsaOcgfm3idDC UvMF6CYXFRLlwho62gH5z39YRdjn7R4bG1OC9c300t6TdkzCmZc7CXGzWhlM1TPJYDD8cFQJEFv X4graiELXoWB6qaVPwjpg6wS+zPQKcWhVzCBETVkxxDVmIqWDPppcgUhX/UDmXtfvC8hEHkQ8gq 5Ej+CENeLMk3ETjTzYvb8U+007G2NeUI7L0fR75fuj8EzW+fvjYOQG6/ILp/TK1O/ZIOyDjuL4x C4bHX4R4sXghvMVbVWHbHjbPpgM+t6TxYHdZzqFyicQ3xTXGYMZsHK02kPsBncHqH0D4ZmbEf4P PPcVr+WV3BZZ1p2rKnfbuk5dfJ3MFRuOViDhZ5o1MdlB+7otNhPt8Bz3SI6Wy4li6JY6SKFmABO XEWnPF2q2OmhjuBw9U0KNGAGCmQNW+aqjxxLxfyjsAli6p4k2Zawp+26XW8aFVPmf44JdjGP0wq K7yX3lE68x3FtXtoLiyfS4s5LyEjCQU5CtEFAei09BiZPJXP5PACbna7eDDBeNhWURvTBp8oq0f 0tbZn8+uE0D7swA== 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