[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <4FF335C6020000780008D613@nat28.tlf.novell.com>
Date: Tue, 03 Jul 2012 17:11:18 +0100
From: "Jan Beulich" <JBeulich@...e.com>
To: "Konrad Rzeszutek Wilk" <konrad.wilk@...cle.com>
Cc: "xen-devel" <xen-devel@...ts.xen.org>,
<linux-kernel@...r.kernel.org>
Subject: Re: [Xen-devel] [PATCH 4/4] xen/hvc: Fix up checks when the
info is allocated.
>>> On 03.07.12 at 17:40, Konrad Rzeszutek Wilk <konrad.wilk@...cle.com> wrote:
> Coverity would complain about this - even thought it looks OK.
>
> CID 401957
> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>
> ---
> drivers/tty/hvc/hvc_xen.c | 15 ++++++---------
> 1 files changed, 6 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/tty/hvc/hvc_xen.c b/drivers/tty/hvc/hvc_xen.c
> index 944eaeb..fbf41be 100644
> --- a/drivers/tty/hvc/hvc_xen.c
> +++ b/drivers/tty/hvc/hvc_xen.c
> @@ -209,10 +209,8 @@ static int xen_hvm_console_init(void)
> info = kzalloc(sizeof(struct xencons_info), GFP_KERNEL | __GFP_ZERO);
> if (!info)
> return -ENOMEM;
> - }
> -
> - /* already configured */
> - if (info->intf != NULL)
> + } else if (info->intf != NULL) {
> + /* already configured */
> return 0;
Is this patch perhaps stale? There appears to be a missing } here,
without which I can't see how this would have built, ...
> /*
> * If the toolstack (or the hypervisor) hasn't set these values, the
> @@ -220,6 +218,7 @@ static int xen_hvm_console_init(void)
> * theoretically correct values, in practice they never are and they
> * mean that a legacy toolstack hasn't initialized the pv console correctly.
> */
> + */
... and this one likely wouldn't build either.
Jan
> r = hvm_get_parameter(HVM_PARAM_CONSOLE_EVTCHN, &v);
> if (r < 0 || v == 0)
> goto err;
> @@ -259,12 +258,10 @@ static int xen_pv_console_init(void)
> info = kzalloc(sizeof(struct xencons_info), GFP_KERNEL | __GFP_ZERO);
> if (!info)
> return -ENOMEM;
> - }
> -
> - /* already configured */
> - if (info->intf != NULL)
> + } else if (info->intf != NULL) {
> + /* already configured */
> return 0;
> -
> + }
> info->evtchn = xen_start_info->console.domU.evtchn;
> info->intf = mfn_to_virt(xen_start_info->console.domU.mfn);
> info->vtermno = HVC_COOKIE;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists