From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754876AbcLaWA6 (ORCPT ); Sat, 31 Dec 2016 17:00:58 -0500 Received: from mout.web.de ([212.227.15.14]:54764 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754805AbcLaWA4 (ORCPT ); Sat, 31 Dec 2016 17:00:56 -0500 Subject: [PATCH 2/6] staging: vchiq_arm: Adjust 13 checks for null pointers To: devel@driverdev.osuosl.org, linux-arm-kernel@lists.infradead.org, linux-rpi-kernel@lists.infradead.org, kbuild test robot , popcornmix@gmail.com, Eric Anholt , Greg Kroah-Hartman , Lee Jones , Stefan Wahren , Stephen Warren , Wei Yongjun References: <5acd65e7-0b5d-0972-5e1a-6e87d71dc1a4@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Message-ID: <2b11ef55-9123-3d0e-fb04-dca8cc3b5081@users.sourceforge.net> Date: Sat, 31 Dec 2016 23:00:09 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 MIME-Version: 1.0 In-Reply-To: <5acd65e7-0b5d-0972-5e1a-6e87d71dc1a4@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:uKUL4IUDkUmnRhacyEftX8ZMfgFU0BDkmnKrATKtYHVuNh8IolF QDT2Aco+AXFcH6dGnpBwMvHdv+/vynH7Ua2NFDZ8JJB4L103Cs9BbhuqYEZBNPvsXWt+j0k kE9mGf+HabF2Nc9mok1Xc4Ac2HVgXuz/j4ThGUOc2iNejm+x/V5RDOi52/YtF0w4fQ6E4g/ xNRkM/NOxMi+LP6I82giw== X-UI-Out-Filterresults: notjunk:1;V01:K0:dcytF20ScDA=:RvgAssdByBY82skxUISgRA n+YgCiiysf4A2DJlcXL/rO/UcrFYmHZ762wxV7GpulUoDD4EYUzGNkm9rHyXNy0pqBxs88DD2 hsM9cGAQWeZT9udjFDyWrO/zObvpZcAWlCiPvDq0XXAcR7z3TlL6Jo3wfxM+hZsT7X8FHPJaQ aeJBMu7ht6tFsvie81K6XM5+fWVHSRx8Sumt6bsUtkOjFEXDl7kfnidrSXdhCPAPBbG+oHeju 0TmrVK/dH5VIYAndBDKdiKWAVdW24hAz8xM+IJ4vthZrMqYvrGtK6/W0N548LSntT0Q076M3+ CNgDD3/ICJp5D7MKzampS8vrgk0N8a5E7ntWEz4Qs5OXsI9Y5OtYR1sjkaU/MTd5GLkR5kdFl +gpPBSLEpSrqrnP6zzL5IT7RsCm6RtOcDYI+Y1f1I5Ha6W8p4o6TxomXyiJ/wh8IxlMWj72ee az3Nxb8+40B/xWzUXnvJF1mzJkRxuCtez9ntJrajrTOsBVFTn4Tdf/TCbhkZMu6VoJYl6yGkZ IW7/UaW/eAvGwH2BhEOVNLfj02IeUd1ZAjQj7ygC/1JlO8cxq7X6VsQwYvfUZzSrWTJxc7tOj UmCKzrq+WdnSXnCifIKm8OOxZHjL7un6RNK4CGjwbfs0ZFk65VNqmFVOCNKds9W8nLW7C7elt vt4LzK52KZuZn9DWJLHhFMSZh56eWk8nLQeim/zwbv1bVlz8UHOoS55RWrmfUxZBYRGgcDvTX qiU8NDF5yZkjz/mhnPHhi+6qfqkirbKX6Zi4nUBinhVSr05mNa8Dj1b/+03gsMCU1izDyAHtW zhpNnoC Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sat, 31 Dec 2016 21:23:24 +0100 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The script "checkpatch.pl" pointed information out like the following. Comparison to NULL could be written … Thus fix the affected source code places. Signed-off-by: Markus Elfring --- .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 34 ++++++++++------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c index 4af77d790ae0..2a260034189d 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c @@ -533,7 +533,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg) /* Remove all services */ i = 0; while ((service = next_service_by_instance(instance->state, - instance, &i)) != NULL) { + instance, &i))) { status = vchiq_remove_service(service->handle); unlock_service(service); if (status != VCHIQ_SUCCESS) @@ -614,7 +614,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg) &args.params, srvstate, instance, user_service_free); - if (service != NULL) { + if (service) { user_service->service = service; user_service->userdata = userdata; user_service->instance = instance; @@ -661,7 +661,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg) VCHIQ_SERVICE_HANDLE_T handle = (VCHIQ_SERVICE_HANDLE_T)arg; service = find_service_for_instance(instance, handle); - if (service != NULL) { + if (service) { USER_SERVICE_T *user_service = (USER_SERVICE_T *)service->base.userdata; /* close_pending is false on first entry, and when the @@ -687,7 +687,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg) VCHIQ_SERVICE_HANDLE_T handle = (VCHIQ_SERVICE_HANDLE_T)arg; service = find_service_for_instance(instance, handle); - if (service != NULL) { + if (service) { USER_SERVICE_T *user_service = (USER_SERVICE_T *)service->base.userdata; /* close_pending is false on first entry, and when the @@ -714,7 +714,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg) VCHIQ_SERVICE_HANDLE_T handle = (VCHIQ_SERVICE_HANDLE_T)arg; service = find_service_for_instance(instance, handle); - if (service != NULL) { + if (service) { status = (cmd == VCHIQ_IOC_USE_SERVICE) ? vchiq_use_service_internal(service) : vchiq_release_service_internal(service); @@ -747,7 +747,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg) service = find_service_for_instance(instance, args.handle); - if ((service != NULL) && (args.count <= MAX_ELEMENTS)) { + if (service && (args.count <= MAX_ELEMENTS)) { /* Copy elements into kernel space */ VCHIQ_ELEMENT_T elements[MAX_ELEMENTS]; if (copy_from_user(elements, args.elements, @@ -1063,11 +1063,11 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg) spin_unlock(&msg_queue_spinlock); up(&user_service->remove_event); - if (header == NULL) + if (!header) ret = -ENOTCONN; else if (header->size <= args.bufsize) { /* Copy to user space if msgbuf is not NULL */ - if ((args.buf == NULL) || + if (!args.buf || (copy_to_user((void __user *)args.buf, header->data, header->size) == 0)) { @@ -1161,7 +1161,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg) VCHIQ_SERVICE_HANDLE_T handle = (VCHIQ_SERVICE_HANDLE_T)arg; service = find_closed_service_for_instance(instance, handle); - if (service != NULL) { + if (service) { USER_SERVICE_T *user_service = (USER_SERVICE_T *)service->base.userdata; close_delivered(user_service); @@ -1559,7 +1559,7 @@ dump_phys_mem(void *virt_addr, uint32_t num_bytes) num_pages = (offset + num_bytes + PAGE_SIZE - 1) / PAGE_SIZE; pages = kmalloc_array(num_pages, sizeof(*pages), GFP_KERNEL); - if (pages == NULL) { + if (!pages) { vchiq_log_error(vchiq_arm_log_level, "Unable to allocation memory for %d pages\n", num_pages); @@ -1590,8 +1590,7 @@ dump_phys_mem(void *virt_addr, uint32_t num_bytes) page_idx = offset / PAGE_SIZE; if (page_idx != prev_idx) { - - if (page != NULL) + if (page) kunmap(page); page = pages[page_idx]; kmapped_virt_ptr = kmap(page); @@ -1609,7 +1608,7 @@ dump_phys_mem(void *virt_addr, uint32_t num_bytes) } out: - if (page != NULL) + if (page) kunmap(page); for (page_idx = 0; page_idx < num_pages; page_idx++) @@ -1644,14 +1643,13 @@ vchiq_read(struct file *file, char __user *buf, VCHIQ_STATE_T * vchiq_get_state(void) { - - if (g_state.remote == NULL) + if (!g_state.remote) printk(KERN_ERR "%s: g_state.remote == NULL\n", __func__); else if (g_state.remote->initialised != 1) printk(KERN_NOTICE "%s: g_state.remote->initialised != 1 (%d)\n", __func__, g_state.remote->initialised); - return ((g_state.remote != NULL) && + return (g_state.remote && (g_state.remote->initialised == 1)) ? &g_state : NULL; } @@ -2655,7 +2653,7 @@ vchiq_instance_get_use_count(VCHIQ_INSTANCE_T instance) int use_count = 0, i; i = 0; while ((service = next_service_by_instance(instance->state, - instance, &i)) != NULL) { + instance, &i))) { use_count += service->service_use_count; unlock_service(service); } @@ -2681,7 +2679,7 @@ vchiq_instance_set_trace(VCHIQ_INSTANCE_T instance, int trace) int i; i = 0; while ((service = next_service_by_instance(instance->state, - instance, &i)) != NULL) { + instance, &i))) { service->trace = trace; unlock_service(service); } -- 2.11.0