From patchwork Wed Dec 8 18:49:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Faust X-Patchwork-Id: 1565456 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=f9rkNqFj; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4J8R8J6HxMz9sXS for ; Thu, 9 Dec 2021 05:51:11 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E2917385843F for ; Wed, 8 Dec 2021 18:51:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E2917385843F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1638989468; bh=C18BVDujw04znztJcHDvMGXRTpugKugsM8fQC9fDK+k=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=f9rkNqFjx7T8nruoeY7LjMlCwU8lJVJffCe/90dNZbsZ5zURkK39cs4YU1okadObg iPjh2qHycF6hHLnGdb4TL0pVdKLhHYooB0rsF1sQ3dviSJz+gziZekp+yXUHJXonJv L0+Rbb3/VWv3DzM9VAM8A/rqoYgxX9pQCkIr8oBo= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by sourceware.org (Postfix) with ESMTPS id 3355C3858003 for ; Wed, 8 Dec 2021 18:49:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 3355C3858003 Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 1B8Hdncm026555 for ; Wed, 8 Dec 2021 18:49:43 GMT Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by mx0b-00069f02.pphosted.com with ESMTP id 3ctup514nq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 08 Dec 2021 18:49:42 +0000 Received: from pps.filterd (userp3020.oracle.com [127.0.0.1]) by userp3020.oracle.com (8.16.1.2/8.16.1.2) with SMTP id 1B8IkjcU155405 for ; Wed, 8 Dec 2021 18:49:41 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2109.outbound.protection.outlook.com [104.47.70.109]) by userp3020.oracle.com with ESMTP id 3cr1sr5jgq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 08 Dec 2021 18:49:41 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=C1mI3Bf2uiFQLTxiDBCnb4CDnDwPhnO76Gg4z9gz3KQB7055H/fGWyIrOg0+wiRZg+ZZltNf/TlRYXqzwUdltN5c3MI9bh2BC9a7oylwO4sKuYqBts2skgKlQbDDbQUPOyllsqKDRY/TRs2i8/7UwIlgbOE8+csVaL1FRyTAA/jhlCsO2U9crs2VRBqA3huSD83zrRYPDlwB3/4wF+9wTof5/sfQVEhU6/nZZZqGFTwTyv/9bqTWroukAtedE6bcXlpJhXmVtdrc4Ebe/oPmhhrZf8LzcnJEi3J8xJuUck0c4Y12OtYWaSJJ47sylr+UGcHFv/8FCWqJdMudNEnFpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=C18BVDujw04znztJcHDvMGXRTpugKugsM8fQC9fDK+k=; b=hbuvo+fzmuoZZ1gCYecLwDbFX+L6g8xNUG5Bp9nTzTWWyTqpN0sv4v+hCHQA6/rgFCNGQq99Oal/sw3SbbFlHNBln4iHpsPEFPvwQytPqi0drL9IYb98yJQXzOepGeaqGqBpT2halzy/tWmVlY1xwtd+nHTBpOYicV+1Lvp34uXxQt5ssU0ezR7ThoIPyxYdOX9GbA3oKsouJ3nnrhXGmAjmXDc6GuJmpljD7ViKOKf/HWGBjaQJiPRSSxD83g0bOhJ7RLMuYA/qolFu6bFC1t00FxtG4O9d0NaR3TPg+iuD8jDyDSYbdxaofjR8ONCiPJlMYufIXluM5AmaJIKsSQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none Received: from SA2PR10MB4458.namprd10.prod.outlook.com (2603:10b6:806:f8::24) by SA2PR10MB4748.namprd10.prod.outlook.com (2603:10b6:806:112::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.21; Wed, 8 Dec 2021 18:49:40 +0000 Received: from SA2PR10MB4458.namprd10.prod.outlook.com ([fe80::7cc8:3113:5f58:eed6]) by SA2PR10MB4458.namprd10.prod.outlook.com ([fe80::7cc8:3113:5f58:eed6%5]) with mapi id 15.20.4755.024; Wed, 8 Dec 2021 18:49:39 +0000 To: gcc-patches@gcc.gnu.org Subject: [COMMITTED] bpf: avoid potential NULL pointer dereference Date: Wed, 8 Dec 2021 10:49:20 -0800 Message-Id: <20211208184920.12048-1-david.faust@oracle.com> X-Mailer: git-send-email 2.31.1 X-ClientProxiedBy: SJ0PR13CA0227.namprd13.prod.outlook.com (2603:10b6:a03:2c1::22) To SA2PR10MB4458.namprd10.prod.outlook.com (2603:10b6:806:f8::24) MIME-Version: 1.0 Received: from sequence.us.oracle.com (2606:b400:8301:1041::16) by SJ0PR13CA0227.namprd13.prod.outlook.com (2603:10b6:a03:2c1::22) with Microsoft SMTP Server (version=TLS1_2, cipher=) via Frontend Transport; Wed, 8 Dec 2021 18:49:39 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 452d01ca-cf41-48be-f0f4-08d9ba7b7d6a X-MS-TrafficTypeDiagnostic: SA2PR10MB4748:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7219; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jvaLMC59m+Kz2aSWNHcpQVWvlbG4hQufCnGibnwVkcnYn1hZKuuVXniUzWVePbxUM+zfWTNoeXC6EpOvOsaWCuLEgA/Fge6cwi5JX2VguGXvydkc86g6FRczTo/k9cSj88/6I8VTKg7Zlgxwxw7QRbTnFm0PYvFSJHL2X6jHQfVkLG1gQL7Pakh8BlIZZtDu/K6CQCUaCtwpM/n4Bn+YufiUO59HAQimPqmMFeP9JCrVnJb4IZwRDmz79phFk4aBsfkCE9H3ZNn5JLyqUoDiQPxsmgsdoG6szFsIw3Q3r8j5Z1IlqsTOyMM/NzyY3pTJ9gf+Hz3AoqJFP6Jdu1aNHVgsnY5NBUI6yEtzIPaGxLaCLUuCrDyc4XZUb28ad328Umh0QGqT6C/Cg4mW0vWJG1Kt61S1Q8dHocBzGUw+4pnUYb43FyBKEI/or6e6SGKh8FO4RxLy/tULidLk2gXwZVhuFZ4ivgrGQbhlthsELTPDaq/IZU1xW8oRV90HdC8c2zHr85lmQhjqU0t4jOsiLCMHd0JilPFUE79AlIG49leKuvIxuYlWh/dPc5sDmf/hhumrHjCDZsRiY4q7xaagl64NPBwLEl99aGreaGsNciJtZdXhr3/nhTm2U7ZM1LU+sHwMueWQS7Bs5JxxzzqeBg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SA2PR10MB4458.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(366004)(2616005)(8676002)(8936002)(6486002)(44832011)(66476007)(508600001)(6916009)(4744005)(316002)(1076003)(6666004)(66556008)(66946007)(38100700002)(2906002)(7696005)(86362001)(83380400001)(186003)(36756003)(52116002)(5660300002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Pnem3dnLvcunDhjUpbrzx17WB+cPOcZED/qYkn1xQH+500+WFYtZtJE7bfPrFhW7UN4OUlUrYQ52O5zJJQ53Kq5vbmO2XOPSFLGjLHsAbh4xrA0GTbSrCrHN1IS7/XbkxTCN7fkqFzkqT0iYEybhChJ0KO1P/qz+Gs+Pq2tt61ITioj3jooQ3bRkI9YF+sFFRgDPfNfbZFk3Vq2R5+H6qGeN6p6C1pPsv7INIvfTSNwq0eoqGI/jRLv84g1jGrIJ4Ol02pa6Lh4xNAWuDeZfnQJlG6wuUOtjs9nbmavx+IbIq72Aiu/pciNOsr0iBkcFR7+LNTPpxLXnOB9ypFEZ9yfQTZhEUlJtyTZOHuLmtxljIQnB8r88zVvl5yGUly4jk84cytI9zO0fJgjXv3nFxpAmXDhHNLLn1BbhmuipJu6yBiWmyUefB3hQzAwrEJYfqmgxejeIkUSbKt+q2La6R0Ox/y9CuO9rT/W/u3VPtsqlxS9bvRpLoKDMqYhnXrz4LxcbMWxyDw24ilF4P9cslypZpHXlhDjJ4ViYYuVywqylwnh3f3GyqE3Zx0YSsWySyl1a1mnj3jcYInmuMjxh17DATxiagRQhAob2reLl3gZ0sNr3N/CH632CWzlUQ1odu7U0RmWweX2KF9d+Nm+sR01u0PcLVuiU7yZFF/Hj/iDef1CseoH6foSGBCMEsA+cDN0lBvrQMKlI9EJQJHn050VpHmgKl3Ad/uNqulFF0v8MNMT6AV62C4lKi7NMmddBJC8RVxCTx5PVqZIEPZVXjyrbM0+zLwLx4ZNL+/tXrdEBmpOckmp3d5lkDJX5KQdDvkSbj1FncHRKe8P2Y3LsFxpmWahqAv9+Rc1MwAAPbZ1eWd2MkR0NI9CNHRCyzUd4wH3emyashhb8/XKcQgt//078zZFZb1kjLsVAi5nei+E2pPLQOa8cdKtj89aoO79w41OCCNtLRjwdJZPYlQGL9Hzt8cB7INFuL/6a0Pbtolh1eCc79ureUOdxbjVe1gU4UKEJKvRMa2GmsIIKTPxtRU1/ra6ifXViH0m6FVsVjI8mBknuLllswHX/5/l4o9tHBGXjua7wYCGj5YW8uTsACpHKeO5Ss0Z+Fs90Ih7hKwyjObvsqkhuckhy89/HUU18ATr1TukpOvs13a4EptZcromkkJfjHKsnpcrSNW83BhVq0YGEFHHnhrqVklrZKshgLvopbmCJ2RifJik4UWRBDdry9PX4f2VANPdNqQUQfEjZtT9k06wXL8zwaCOy7CD5O9IzaW7hbpWvA1ovOpkKB6TLy4ly12gyfpzFKnB3Fbu6mkox4ygB07DuVuJXIJ756uvA55BOCrI2qJogDF0t/Gc1YmyF8Y9IV1gSGeHN3lxhnzWRzywKPAHcAfYiiX8JSnSm2FkijWDzjpajSys3g9JAi0ZqIxpNUWEHtuZ/ihQFebZiFd46LJ/y58tiI2YSzGJ0d8KFLxXIyBDf9fRkpeP/Yo41UuqEzjSLJRMgaera9fjQSONyxeEJfcj0KBzpKVPWdzkj2GGUuaNh3YZF50NjPeuV8jJgoHbM8hlpc/fxl8Xa3uGf9TG/SBuzBq+om345/RZ5EUgsg18vr7Yyxil/DV/vvLABNrKYVWglxbuD4uG52kXzNGl4rQV3Uzpv X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 452d01ca-cf41-48be-f0f4-08d9ba7b7d6a X-MS-Exchange-CrossTenant-AuthSource: SA2PR10MB4458.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Dec 2021 18:49:39.9102 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: hriWHFcN+9oM+RxnK1JkeobI7PeXVtjMkYL01wN6fubT4+mZQBF26OVHnqF/JxJaerS2e4bN33YLV3EzaYdrFg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA2PR10MB4748 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10192 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 mlxscore=0 spamscore=0 phishscore=0 bulkscore=0 suspectscore=0 malwarescore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2112080106 X-Proofpoint-GUID: 0dPWSEtne-Y2LTpFcIN65DhG8Zjy1AjV X-Proofpoint-ORIG-GUID: 0dPWSEtne-Y2LTpFcIN65DhG8Zjy1AjV X-Spam-Status: No, score=-13.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, MSGID_FROM_MTA_HEADER, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: David Faust via Gcc-patches From: David Faust Reply-To: David Faust Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" [Committed as obvious.] If the result from SSA_NAME_DEF_STMT is NULL, we could try to dereference it anyway and ICE. Avoid this. gcc/ChangeLog: * config/bpf/bpf.c (handle_attr_preserve): Avoid calling is_gimple_assign with a NULL pointer. --- gcc/config/bpf/bpf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcc/config/bpf/bpf.c b/gcc/config/bpf/bpf.c index 9d2c0bb6818..c054c1ead6b 100644 --- a/gcc/config/bpf/bpf.c +++ b/gcc/config/bpf/bpf.c @@ -1482,7 +1482,7 @@ handle_attr_preserve (function *fn) && TREE_CODE (TREE_OPERAND (expr, 0)) == SSA_NAME) { gimple *def_stmt = SSA_NAME_DEF_STMT (TREE_OPERAND (expr, 0)); - if (is_gimple_assign (def_stmt)) + if (def_stmt && is_gimple_assign (def_stmt)) expr = gimple_assign_rhs1 (def_stmt); }