Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DDDEBCA9EAF for ; Mon, 21 Oct 2019 14:40:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BB50E2053B for ; Mon, 21 Oct 2019 14:40:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727355AbfJUOkN (ORCPT ); Mon, 21 Oct 2019 10:40:13 -0400 Received: from orbyte.nwl.cc ([151.80.46.58]:51482 "EHLO orbyte.nwl.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727049AbfJUOkN (ORCPT ); Mon, 21 Oct 2019 10:40:13 -0400 Received: from localhost ([::1]:36340 helo=tatos) by orbyte.nwl.cc with esmtp (Exim 4.91) (envelope-from ) id 1iMYqx-0006CB-9h; Mon, 21 Oct 2019 16:40:11 +0200 From: Phil Sutter To: Pablo Neira Ayuso Cc: netfilter-devel@vger.kernel.org, =?UTF-8?q?M=C3=A1t=C3=A9=20Eckl?= Subject: [nft PATCH] tproxy: Add missing error checking when parsing from netlink Date: Mon, 21 Oct 2019 16:40:03 +0200 Message-Id: <20191021144003.13415-1-phil@nwl.cc> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org netlink_get_register() may return NULL and every other caller checks that. Assuming this situation is not expected, just jump to 'err' label without queueing an explicit error message. Fixes: 2be1d52644cf7 ("src: Add tproxy support") Signed-off-by: Phil Sutter --- src/netlink_delinearize.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/netlink_delinearize.c b/src/netlink_delinearize.c index f7d328a836998..154353b8161a0 100644 --- a/src/netlink_delinearize.c +++ b/src/netlink_delinearize.c @@ -1041,6 +1041,8 @@ static void netlink_parse_tproxy(struct netlink_parse_ctx *ctx, reg = netlink_parse_register(nle, NFTNL_EXPR_TPROXY_REG_ADDR); if (reg) { addr = netlink_get_register(ctx, loc, reg); + if (addr == NULL) + goto err; switch (stmt->tproxy.family) { case NFPROTO_IPV4: @@ -1060,6 +1062,8 @@ static void netlink_parse_tproxy(struct netlink_parse_ctx *ctx, reg = netlink_parse_register(nle, NFTNL_EXPR_TPROXY_REG_PORT); if (reg) { port = netlink_get_register(ctx, loc, reg); + if (port == NULL) + goto err; expr_set_type(port, &inet_service_type, BYTEORDER_BIG_ENDIAN); stmt->tproxy.port = port; } -- 2.23.0