From patchwork Sat Jan 19 06:20:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yafang Shao X-Patchwork-Id: 1027872 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="D5WKZGm2"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43hSPW63LHz9sBQ for ; Sat, 19 Jan 2019 17:21:19 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727260AbfASGVN (ORCPT ); Sat, 19 Jan 2019 01:21:13 -0500 Received: from mail-pf1-f194.google.com ([209.85.210.194]:33571 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726205AbfASGVM (ORCPT ); Sat, 19 Jan 2019 01:21:12 -0500 Received: by mail-pf1-f194.google.com with SMTP id c123so7675178pfb.0 for ; Fri, 18 Jan 2019 22:21:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=IX5M0lMetHISyJSeOgP0awWFC7m2razfUZQYem09VVM=; b=D5WKZGm2VJwWvpWVO+IDbEOPye4lYMeEev0Ts5eWAUauLhn85NhI25Tw8lGRs+ISJG +GbEaWgWQ5r13IGcA/JIGb/Nlonu4Pg2MJHbHjW5iBSvfU69I/m6Kvnv8ivsTfigtNQK QMII9+YBeMewwszLCy3wi91uJop2RECvbDmqiHSq1eVzgfXou4JwUopYPFusC+r70NNQ jb5wYnEeKmvwlT1AbQ/aRQhQ4nJg1lKTmiAnOe9fUVYO6GWI79ESVt19eE4EtMEGuLDu 4DxCDX9yXAO3d4fFJPpSLY3UlnfThP+GaRo0YCQFh2LLa6UqccK1NJ0s/PsZzGHS+EYH L0/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=IX5M0lMetHISyJSeOgP0awWFC7m2razfUZQYem09VVM=; b=h8TNbypydpPrfO+0LOVEX8UKlLvry8E9HdmmElgZvS/csiXp5Jx4AHAjLzvcVQ8RTQ RW6z4wOWt4JgGJP0uzTzaWwPT5bCucbdB7iXoIxy/w3ZWN/qdbOIfn4BFdUmICRMfpn5 edvqpm8OJLyjH5Fv8D3xstzebDEPxF5OdVZrEZIFtynhlHwUxigQEW4dXDMvIN0K6sn8 QXwWAYpY8xa+0LGest5+Fkb03bKI+J+V2Z/c+mtdcvqP7vTP59kw1cbr4IluwdcvFKmc /k4Vtaw3ISF+6JmwkwYWeZQpg1NZBf9ebm9ybhkQkgYOCTKcmfw6UJJ9mJqwROMkuRiq L2ng== X-Gm-Message-State: AJcUukfkXPPDOp1A0R5Bdc8JNaje8jRb3KOoIal5m/xXuc9vnmtR9C4U xtlE4V8OO0IRfBOztWbH5D0= X-Google-Smtp-Source: ALg8bN7lH7F/FYZQ91yyhB7arH0YpEVmUBeyz46YrcmXCDERQONq62XyObri/5euSbdH+PAW9lJN1g== X-Received: by 2002:a62:11c7:: with SMTP id 68mr22121664pfr.21.1547878872207; Fri, 18 Jan 2019 22:21:12 -0800 (PST) Received: from localhost.localdomain ([203.100.54.194]) by smtp.gmail.com with ESMTPSA id u126sm11281395pgb.2.2019.01.18.22.21.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Jan 2019 22:21:11 -0800 (PST) From: Yafang Shao To: ast@kernel.org, daniel@iogearbox.net Cc: netdev@vger.kernel.org, shaoyafang@didiglobal.com, Yafang Shao Subject: [PATCH bpf-next] bpf: use the proper optlen when doing strncpy in bpf_getsockopt() Date: Sat, 19 Jan 2019 14:20:52 +0800 Message-Id: <1547878852-22081-1-git-send-email-laoar.shao@gmail.com> X-Mailer: git-send-email 1.8.3.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org As the last character of optval will be set with 0, so just copying (optlen - 1) characters is enough. Signed-off-by: Yafang Shao Acked-by: Martin KaFai Lau Acked-by: Lawrence Brakmo --- net/core/filter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/core/filter.c b/net/core/filter.c index 447dd1b..7a4de22 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -4262,7 +4262,7 @@ static unsigned long bpf_xdp_copy(void *dst_buff, const void *src_buff, if (!icsk->icsk_ca_ops || optlen <= 1) goto err_clear; - strncpy(optval, icsk->icsk_ca_ops->name, optlen); + strncpy(optval, icsk->icsk_ca_ops->name, optlen - 1); optval[optlen - 1] = 0; break; case TCP_SAVED_SYN: