From patchwork Fri Apr 27 14:04:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 905779 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=oracle.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=oracle.com header.i=@oracle.com header.b="rVnyAKJF"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40Xcgr3qZwz9s0w for ; Sat, 28 Apr 2018 01:05:44 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933801AbeD0OEz (ORCPT ); Fri, 27 Apr 2018 10:04:55 -0400 Received: from userp2130.oracle.com ([156.151.31.86]:42866 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933783AbeD0OEv (ORCPT ); Fri, 27 Apr 2018 10:04:51 -0400 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w3RE1wiW159750; Fri, 27 Apr 2018 14:04:25 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=date : from : to : cc : subject : message-id : mime-version : content-type; s=corp-2017-10-26; bh=sxqHtyJ4KoQ7pGo0f1uMis4TunFcNwBNOezY07WApxQ=; b=rVnyAKJFd5pJ6K2wOcbRT2tbMb8smKYvLcRJkFnDGWrfJQutoXFsHTq4+KMqH4i0j173 Tf3Ngxhjizs8tadeH7sPxCd6YjZSKqmlxeRlEZNlGWfSqY9PotLWUUbDGkDvS+juwj6q ccnksrOsZSYSsh+f9U5AmYBGc5po0xVnYmSJUTXaeeHvfdpXO7X2ZoP6ZZ1W4/CBWw/x cXUJ4+NO15G4wU4eU6piUIXm3dXkM396CnYCDi83xmnsnFPxWELCkSSrJnO6DRXpHfh2 UD+mI7KVyn/YjhF1UiQqRpPXLiDVCkQE+qeewB9d+lM9BkC0diu9yr5MhWI0VHVqUK6n rA== Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by userp2130.oracle.com with ESMTP id 2hfvrc7qqp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 27 Apr 2018 14:04:25 +0000 Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by aserv0021.oracle.com (8.14.4/8.14.4) with ESMTP id w3RE4OcA007743 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 27 Apr 2018 14:04:24 GMT Received: from abhmp0007.oracle.com (abhmp0007.oracle.com [141.146.116.13]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id w3RE4Na9012211; Fri, 27 Apr 2018 14:04:23 GMT Received: from mwanda (/197.254.35.146) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 27 Apr 2018 07:04:23 -0700 Date: Fri, 27 Apr 2018 17:04:09 +0300 From: Dan Carpenter To: Alexei Starovoitov , Martin KaFai Lau Cc: Daniel Borkmann , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH 1/2] bpf: btf: silence uninitialize variable warnings Message-ID: <20180427140409.GA19583@mwanda> MIME-Version: 1.0 Content-Disposition: inline X-Mailer: git-send-email haha only kidding User-Agent: Mutt/1.9.4 (2018-02-28) X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8875 signatures=668698 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=773 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1711220000 definitions=main-1804270135 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Smatch complains that size can be uninitialized if btf_type_id_size() returns NULL. It seems reasonable enough to check for that. Signed-off-by: Dan Carpenter --- This goes to the BPF tree (linux-next). diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c index 22e1046a1a86..e631b6fd60d3 100644 --- a/kernel/bpf/btf.c +++ b/kernel/bpf/btf.c @@ -1229,7 +1229,8 @@ static int btf_array_check_member(struct btf_verifier_env *env, } array_type_id = member->type; - btf_type_id_size(btf, &array_type_id, &array_size); + if (!btf_type_id_size(btf, &array_type_id, &array_size)) + return -EINVAL; struct_size = struct_type->size; bytes_offset = BITS_ROUNDDOWN_BYTES(struct_bits_off); if (struct_size - bytes_offset < array_size) { @@ -1351,6 +1352,8 @@ static void btf_array_seq_show(const struct btf *btf, const struct btf_type *t, elem_type_id = array->type; elem_type = btf_type_id_size(btf, &elem_type_id, &elem_size); + if (!elem_type) + return; elem_ops = btf_type_ops(elem_type); seq_puts(m, "["); for (i = 0; i < array->nelems; i++) {