From patchwork Sat Feb 6 15:34:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Theil X-Patchwork-Id: 12072217 X-Patchwork-Delegate: johannes@sipsolutions.net 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=-16.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 19D77C433DB for ; Sat, 6 Feb 2021 15:36:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D0E6664E86 for ; Sat, 6 Feb 2021 15:35:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230179AbhBFPfV (ORCPT ); Sat, 6 Feb 2021 10:35:21 -0500 Received: from smail.rz.tu-ilmenau.de ([141.24.186.67]:40988 "EHLO smail.rz.tu-ilmenau.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229715AbhBFPfQ (ORCPT ); Sat, 6 Feb 2021 10:35:16 -0500 Received: from isengard.fritz.box (unknown [87.147.51.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smail.rz.tu-ilmenau.de (Postfix) with ESMTPSA id 3E9C5580060; Sat, 6 Feb 2021 16:34:34 +0100 (CET) From: Markus Theil To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Markus Theil Subject: [PATCH 2/3] rfkill.c: deal with updated struct size Date: Sat, 6 Feb 2021 16:34:10 +0100 Message-Id: <20210206153411.19097-2-markus.theil@tu-ilmenau.de> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210206153411.19097-1-markus.theil@tu-ilmenau.de> References: <20210206153411.19097-1-markus.theil@tu-ilmenau.de> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Signed-off-by: Markus Theil --- rfkill.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rfkill.c b/rfkill.c index 8cd81fe..6b5ca2c 100644 --- a/rfkill.c +++ b/rfkill.c @@ -45,13 +45,14 @@ static void rfkill_event(void) if (n == 0) continue; + memset(&event, 0, sizeof(event)); len = read(fd, &event, sizeof(event)); if (len < 0) { perror("Reading of RFKILL events failed"); break; } - if (len != RFKILL_EVENT_SIZE_V1) { + if (len < RFKILL_EVENT_SIZE_V1) { fprintf(stderr, "Wrong size of RFKILL event\n"); continue; } @@ -206,6 +207,7 @@ static int rfkill_list(const char *param) } while (1) { + memset(&event, 0, sizeof(event)); len = read(fd, &event, sizeof(event)); if (len < 0) { if (errno == EAGAIN) @@ -214,7 +216,7 @@ static int rfkill_list(const char *param) break; } - if (len != RFKILL_EVENT_SIZE_V1) { + if (len < RFKILL_EVENT_SIZE_V1) { fprintf(stderr, "Wrong size of RFKILL event\n"); continue; }