Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3885363pxf; Tue, 6 Apr 2021 02:44:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyIBlh2d4fB40GqnKumqUQ7NFP4ukrO/M0M4KSsorlQ6gQpNBNLi3BAWQKAjVQcGyKizPqC X-Received: by 2002:a92:6011:: with SMTP id u17mr2601032ilb.274.1617702250922; Tue, 06 Apr 2021 02:44:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617702250; cv=none; d=google.com; s=arc-20160816; b=qM+eoEx6H4NUjphOLmYh9wTogoFnhZtIYAHYm+fZC4uSLt/j+sh3ilwrMyBL9oQ7O9 MHOm5sHZ2/iiCJXstwMtCSksyVsDxNEJGqUaRiu0X1h2PhRS+BhI+VtlgRlADPF1QImg utwWD5FKcavLUapElo768YPsIPzvGqk/lN+VVw/pQCf6sJNrJNm02rkUbkHuSO9duF26 GfedrIUF1vDtibwzDx7nK0GddCDPMVMiW2y96tda43dljLgSflnsLOKfXuVeaoacLcwb 0pgSZYhBEynSHqQP7/+f79oHABXxLY4TRKfC/UsC7eq4RYovgpwWPLI2TGsePMU0XdBg D24g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:from:subject:cc:to:message-id:date; bh=t6yQekGqF3hpEQ/RPJ+H04bYlIw2T321Vuec0/zuGIs=; b=yhueawMkVDuavWDj0hzCACH3HFia+vCx9dXd5N3WNVAQefKrQlQTdojhYCMSGsmgym rd4UW1FLTQqJMBs6rz1at12pa7GUkbhF5GLlkEGlMnYQ5c51RUyG5vhvXnj9oF7GXQGI 00WZ+Xy/2y10MDLeYUxsOnYQeHd2avuYI9gQRmLzjtOhGpoTcelLep6OZTa9hp+QUvxa +791kPdXk1u0snyjt6CafHcm84ms4Yuy7XdxAjIyy5JMUlRNgHAjQmkQ65lqDVUqkyT9 gZIqp/VwlSwxejcTQxaZqFeFJfeGrRIKSII+90SqFPrXoOT1q1bAqHChPlpGEY5dd4PR 7JRg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id q1si16623571ilv.149.2021.04.06.02.43.58; Tue, 06 Apr 2021 02:44:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241142AbhDEV7n (ORCPT + 99 others); Mon, 5 Apr 2021 17:59:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53798 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241318AbhDEV7h (ORCPT ); Mon, 5 Apr 2021 17:59:37 -0400 Received: from mail.monkeyblade.net (shards.monkeyblade.net [IPv6:2620:137:e000::1:9]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F1B6CC061756; Mon, 5 Apr 2021 14:59:30 -0700 (PDT) Received: from localhost (unknown [IPv6:2601:601:9f00:477::3d5]) by mail.monkeyblade.net (Postfix) with ESMTPSA id 70CDA4D309A87; Mon, 5 Apr 2021 14:59:28 -0700 (PDT) Date: Mon, 05 Apr 2021 14:59:21 -0700 (PDT) Message-Id: <20210405.145921.1248097047641627556.davem@davemloft.net> To: phil@philpotter.co.uk Cc: kuba@kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] net: tun: set tun->dev->addr_len during TUNSETLINK processing From: David Miller In-Reply-To: <20210405113555.9419-1-phil@philpotter.co.uk> References: <20210405113555.9419-1-phil@philpotter.co.uk> X-Mailer: Mew version 6.8 on Emacs 27.1 Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.6.2 (mail.monkeyblade.net [0.0.0.0]); Mon, 05 Apr 2021 14:59:28 -0700 (PDT) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Phillip Potter Date: Mon, 5 Apr 2021 12:35:55 +0100 > When changing type with TUNSETLINK ioctl command, set tun->dev->addr_len > to match the appropriate type, using new tun_get_addr_len utility function > which returns appropriate address length for given type. Fixes a > KMSAN-found uninit-value bug reported by syzbot at: > https://syzkaller.appspot.com/bug?id=0766d38c656abeace60621896d705743aeefed51 > > Reported-by: syzbot+001516d86dbe88862cec@syzkaller.appspotmail.com > Signed-off-by: Phillip Potter > --- > drivers/net/tun.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 48 insertions(+) > > diff --git a/drivers/net/tun.c b/drivers/net/tun.c > index 978ac0981d16..56c26339ee3b 100644 > --- a/drivers/net/tun.c > +++ b/drivers/net/tun.c > @@ -69,6 +69,14 @@ > #include > #include > #include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > > #include > #include > @@ -2925,6 +2933,45 @@ static int tun_set_ebpf(struct tun_struct *tun, struct tun_prog __rcu **prog_p, > return __tun_set_ebpf(tun, prog_p, prog); > } > > +/* Return correct value for tun->dev->addr_len based on tun->dev->type. */ > +static inline unsigned char tun_get_addr_len(unsigned short type) > +{ Please do not use inline in foo.c files, let the compiler decide. Thanks.