Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp1161130yba; Thu, 18 Apr 2019 16:38:14 -0700 (PDT) X-Google-Smtp-Source: APXvYqwCtpzFQMa+nRlbEfUBM+y7e/pSJ7IX89sl8I+h/CqwOrq4ojfiK67pVdbbKSxI7g3DVeQa X-Received: by 2002:a62:ed16:: with SMTP id u22mr442662pfh.47.1555630694350; Thu, 18 Apr 2019 16:38:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555630694; cv=none; d=google.com; s=arc-20160816; b=fDS0FNxJKlCViKVnGf7jlTOyOcItBxqrNEeGu2zYasvh7S5aEJvosnf62bhcXrBbXo LMbcrmlNueOonaMEIUFaDSlTiO4pRFNHcrluVEYFaaYCEekp8ulCS6xLeu21hiJsxlRZ JFy1XIADqpKgj0aO+nE2P8VpIF44POV1+BNaDjgm1YvXHDzfokVihfA7zOqEc0Zdz854 /SOJo58O6s8YqVB4w6eGHG0ANIWXT6oXbBe3jgModzttVgiOTjdhy6c/5GkNFVtdMazy 1l+voxEhQvlRS5rOJL7O9793IvoVBgSeGdQ+Dq34wDeK3wNajOQ8lMVCZCY4eszurB8w MSvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from; bh=Oe7ntwbNrv4TyjGcZNkzZ61/CGVEeFlc+QH+3TGpTYE=; b=L/LsZ/HDw7P6wIFJEx2jiWwPK6IhJKbSwUjnTm41qkSO2wKoELJYvvV77tuCCx4/DQ AXMSUbC6P4zvNqlUQXcmkVcQhRlg2ev1IyWtEp+0GPZ0ko748Gn/HfGHL+re+RLxEHY8 db+zKelunzm00yEjAdUX5Xrc5q0zx+RmWSpjPHwAaQ6Ip7COrszKVD7cJf3tuw7I+WW7 6AUNmZFPF53E0yIe1xXYt62osAGKDM1nH2Hc/Ajan9u9p3MzpsPPC+v01vot+YVYEtsm 1l3iTalUZHTy39N0Yy1e7K4wa7wRr3rjHooJLliQ9nxnJu6KKVlQOF93nAOK8O6qxZLB tKTg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t15si3671728pfe.240.2019.04.18.16.37.58; Thu, 18 Apr 2019 16:38:14 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726386AbfDRXhI (ORCPT + 99 others); Thu, 18 Apr 2019 19:37:08 -0400 Received: from www.osadl.org ([62.245.132.105]:52380 "EHLO www.osadl.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725887AbfDRXhH (ORCPT ); Thu, 18 Apr 2019 19:37:07 -0400 Received: from debian01.hofrr.at (178.115.242.59.static.drei.at [178.115.242.59]) by www.osadl.org (8.13.8/8.13.8/OSADL-2007092901) with ESMTP id x3INaWCx006335; Fri, 19 Apr 2019 01:36:32 +0200 From: Nicholas Mc Guire To: Eric Anholt Cc: Stefan Wahren , Greg Kroah-Hartman , Dominic Braun , Tobias Buettner , Nicolas Saenz Julienne , Luis Chamberlain , Phil Elwell , linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Nicholas Mc Guire Subject: [PATCH V2] staging: vc04_services: handle kzalloc failure Date: Fri, 19 Apr 2019 01:31:08 +0200 Message-Id: <1555630268-17017-1-git-send-email-hofrat@osadl.org> X-Mailer: git-send-email 2.1.4 X-Spam-Status: No, score=-4.2 required=6.0 tests=BAYES_00,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on www.osadl.org Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The kzalloc here was being used without checking the return - if the kzalloc fails return VCHIQ_ERROR. The call-site of vchiq_platform_init_state() vchiq_init_state() was not responding to an allocation failure so checks for != VCHIQ_SUCCESS and pass VCHIQ_ERROR up to vchiq_platform_init() which then will fail with -EINVAL. Signed-off-by: Nicholas Mc Guire Reported-by: kbuild test robot --- Problem located with experimental coccinelle script V2: The != VCHIQ_SUCCES went unnoticed not clear how I did that as building drivers/staging/vc04_services/vchiq.o seemed to have succeeded anyway kbuild test found it. This is one of the disadvantages if one can not make path/file.o due to missing Makefiles and is required to build entire directories for compile-testing, I suspect that I did not clean the directory before compile-testing the patch. Patch was compile-tested with: bcm2835_defconfig (implies BCM2835_VCHIQ=m) (with sparse warning: CHECK drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c:410:29: warning: incorrect type in argument 1 (different address spaces) drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c:410:29: expected void const *x drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c:410:29: got char [noderef] *buf drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c:416:63: warning: incorrect type in argument 1 (different address spaces) drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c:416:63: expected void const *addr drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c:416:63: got char [noderef] * CC [M] drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.o Q: should this buf have been remapped to user space e.g. remap_vmalloc_range ? Patch is against 5.1-rc5 (localversion next is 20190417) drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c | 3 +++ drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c index 31eb7d5..a9a2291 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c @@ -179,6 +179,9 @@ vchiq_platform_init_state(struct vchiq_state *state) struct vchiq_2835_state *platform_state; state->platform_state = kzalloc(sizeof(*platform_state), GFP_KERNEL); + if (!state->platform_state) + return VCHIQ_ERROR; + platform_state = (struct vchiq_2835_state *)state->platform_state; platform_state->inited = 1; diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c index 6057a90..92e6221 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c @@ -2209,6 +2209,8 @@ vchiq_init_state(struct vchiq_state *state, struct vchiq_slot_zero *slot_zero) local->debug[DEBUG_ENTRIES] = DEBUG_MAX; status = vchiq_platform_init_state(state); + if (status != VCHIQ_SUCCESS) + return VCHIQ_ERROR; /* bring up slot handler thread -- 2.1.4