Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19;
From:   "Keller, Jacob E" <jacob.e.keller@intel.com>
To:     "trix@redhat.com" <trix@redhat.com>,
        "Brandeburg, Jesse" <jesse.brandeburg@intel.com>,
        "Nguyen, Anthony L" <anthony.l.nguyen@intel.com>,
        "davem@davemloft.net" <davem@davemloft.net>,
        "kuba@kernel.org" <kuba@kernel.org>,
        "nathan@kernel.org" <nathan@kernel.org>,
        "ndesaulniers@google.com" <ndesaulniers@google.com>
CC:     "intel-wired-lan@lists.osuosl.org" <intel-wired-lan@lists.osuosl.org>,
        "netdev@vger.kernel.org" <netdev@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "llvm@lists.linux.dev" <llvm@lists.linux.dev>
Subject: RE: [PATCH] ice: check the return of ice_ptp_gettimex64
Thread-Topic: [PATCH] ice: check the return of ice_ptp_gettimex64
Thread-Index: AQHYIa/qAxP3En8yz0ybzx/1UAHuxqyTWojQ
Date:   Mon, 14 Feb 2022 18:16:56 +0000
Message-ID: <CO1PR11MB50898B7C5A2F51A42B9F07D7D6339@CO1PR11MB5089.namprd11.prod.outlook.com>
References: <20220214143327.2884183-1-trix@redhat.com>
In-Reply-To: <20220214143327.2884183-1-trix@redhat.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?j+M3qt1HMxT3cMHXiGpmc8deFsLEcxYzqPuEa84TFl+EQuxTj1tCMHu9WfkR?=
 =?us-ascii?Q?8sCmF1yEgTaBjp2P7Qx42xGcHDnzjhGAAieKJh6q81Qsvx006UGt3gSO6FHl?=
 =?us-ascii?Q?MMBMTjCMOZ6lzGuRUUTV3cn3ahPcKtQqoHEyrJrndhLUPr//FuNYH0SeEH9V?=
 =?us-ascii?Q?Pqf6DJK91KAEdRJ3nE2anU28g0IMTul0XRyshS4rqL7cfnf65qEhX+WzKcD+?=
 =?us-ascii?Q?aqnZWL0VxshLrdhnW7CWv2eclxd9uZwTjkQiQTLoJ9qUFK5PQ80PhpZI9Cy8?=
 =?us-ascii?Q?VbPaPM4MFbBIHD3B/zAGEOdGsbi4bCvd3A29BAobO8/P6nwJYahtd+aOwnqk?=
 =?us-ascii?Q?C4Pj1KIw8sADfm8ITGDtOj/Yj3Lv5U0SmniQNx1gahn+0JBBLhQU1Ei/oQqS?=
 =?us-ascii?Q?1p1Thw5A4Lp1HvMWSMpcR+3jIJ1xHD50fOvg4zP+C6ST7lRlrbVs0BMan5UP?=
 =?us-ascii?Q?Hg6ajeBMumh1SFPJXw8QNM/Z5DWjRPtT5QttCh+i2Rq1aS6ZRu/4kEm6z2HK?=
 =?us-ascii?Q?bb9R7YwgxOq0hQeUMsWAVST9gbYwc898WNdgZoSpc6Q2OXgQhSpLhyIl011H?=
 =?us-ascii?Q?N0hjBq/ll9P2VXK0Dqk59bZqGugA04eFedEFa+fPR0VDLt30CjMhpMiVGpo8?=
 =?us-ascii?Q?IBp0mgl8RGj3Y7Yl5mIm1u5cgADcuj1RRqKwv0sF/leqL+XtUqypiW+ccCJO?=
 =?us-ascii?Q?34aQ3ywTQMmY8Q3ez40puJm+OTeltsbJ6270cdgZg+nrCok5YtwuBfDOIiVA?=
 =?us-ascii?Q?oHrFK1r5fieDNcSGQweHbBEzHcHmoRPWUAIUen8fcb4NLtpX7wgGrOjOW7jH?=
 =?us-ascii?Q?gZdUtNzfnuWPfc/JAnhh46uhAUBy3rAEHoZ7Ff91F4cNoN6LC4/H5TcI331Q?=
 =?us-ascii?Q?OTKyk1yd59BQr7suC/IXb39bl0tfcTuMh/rmCNaJ9Np+3HZAtzYa2KPANnNb?=
 =?us-ascii?Q?KPF4idA+AWc7XWd5RmpV50GrykEYU5kWQwa3oII7AvXgt4R7aHIsRsqBLIv7?=
 =?us-ascii?Q?XijBmd8NUMPhCdQEjAOZgqcjXcbijO5O87et4605LI1rqvvXPcS5CXndx3o2?=
 =?us-ascii?Q?T66D82Ijg8O8JckurbLbWxj7vYmh09rYoJ7aAg6nyZeTmxMm/11ryWazhqJ5?=
 =?us-ascii?Q?ogGZYrgmrITiw6tq2vXvJEQ/DfpQ2Mu51Fbk4nSdTXZJXrlhf373P6piWdzt?=
 =?us-ascii?Q?yNO7o5/I7qSswm/T5vyGe1S99QA2nLO6Bp9H0XU7uVtT2qsGdo9BrjL3VTgm?=
 =?us-ascii?Q?AJZ1XwORMPTARerfRbXag/p5456f/3Lqyqn9N96ZOJJVgKUD+aXPavrtAlZ2?=
 =?us-ascii?Q?yBA1mQZIgAEcXDpA5FIHhUk47lzlAK80EvSmtzNTpQNmG6s1bBgLUiJxpARw?=
 =?us-ascii?Q?UQBCGOrWjxvbX+oB+AFwolcpAbgWugfepxKGZKCKSwWap62d4rPjjgT9KApf?=
 =?us-ascii?Q?7iw0euSSj6OsGc7gy8X4VTAAEMBuLRQi7+e4HLRDGr1zKEwtXQhKaJx4w4QS?=
 =?us-ascii?Q?AREY7NOAaY2tt6I/8/ZMHUUqV3HuxObR3kHY6LMg/8xmtsq9QusAEm3hFqXF?=
 =?us-ascii?Q?458S3Fe1jLGw6uwMiffxdXNcCFBWB275tQh13QWj0MYzSomhfF6kfn008jQ7?=
 =?us-ascii?Q?LKZ2jVykvoIZfAjrzUG1VF750kFsPt7OZGRO3JrfjUnJ5JsYENTi70JmcT4j?=
 =?us-ascii?Q?jBk3sg=3D=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB5089.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8e1e7496-0385-4a5f-7bf6-08d9efe62fa2
X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Feb 2022 18:16:56.9548
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: vRoyFkB948D7FMYSDRnwyAkj/fEG1QQ1SEJz0/X+l84NRmNBhwX0A0jPSmIi+QpK50fJE/FoFNgtm/nVuhzL6ofQ9uAulMWPxWjjJixRdEQ=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB3737
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
	DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE
	autolearn=no autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
	lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


> -----Original Message-----
> From: trix@redhat.com <trix@redhat.com>
> Sent: Monday, February 14, 2022 6:33 AM
> To: Brandeburg, Jesse <jesse.brandeburg@intel.com>; Nguyen, Anthony L
> <anthony.l.nguyen@intel.com>; davem@davemloft.net; kuba@kernel.org;
> nathan@kernel.org; ndesaulniers@google.com; Keller, Jacob E
> <jacob.e.keller@intel.com>
> Cc: intel-wired-lan@lists.osuosl.org; netdev@vger.kernel.org; linux-
> kernel@vger.kernel.org; llvm@lists.linux.dev; Tom Rix <trix@redhat.com>
> Subject: [PATCH] ice: check the return of ice_ptp_gettimex64
>=20
> From: Tom Rix <trix@redhat.com>
>=20
> Clang static analysis reports this issue
> time64.h:69:50: warning: The left operand of '+'
>   is a garbage value
>   set_normalized_timespec64(&ts_delta, lhs.tv_sec + rhs.tv_sec,
>                                        ~~~~~~~~~~ ^
> In ice_ptp_adjtime_nonatomic(), the timespec64 variable 'now'
> is set by ice_ptp_gettimex64().  This function can fail
> with -EBUSY, so 'now' can have a gargbage value.
> So check the return.
>=20
> Fixes: 06c16d89d2cb ("ice: register 1588 PTP clock device object for E810=
 devices")
> Signed-off-by: Tom Rix <trix@redhat.com>

Ahhh yep. Good fix. Thanks!

> ---
>  drivers/net/ethernet/intel/ice/ice_ptp.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
>=20
> diff --git a/drivers/net/ethernet/intel/ice/ice_ptp.c
> b/drivers/net/ethernet/intel/ice/ice_ptp.c
> index ae291d442539..000c39d163a2 100644
> --- a/drivers/net/ethernet/intel/ice/ice_ptp.c
> +++ b/drivers/net/ethernet/intel/ice/ice_ptp.c
> @@ -1533,9 +1533,12 @@ ice_ptp_settime64(struct ptp_clock_info *info, con=
st
> struct timespec64 *ts)
>  static int ice_ptp_adjtime_nonatomic(struct ptp_clock_info *info, s64 de=
lta)
>  {
>  	struct timespec64 now, then;
> +	int ret;
>=20
>  	then =3D ns_to_timespec64(delta);
> -	ice_ptp_gettimex64(info, &now, NULL);
> +	ret =3D ice_ptp_gettimex64(info, &now, NULL);
> +	if (ret)
> +		return ret;
>  	now =3D timespec64_add(now, then);
>=20
>  	return ice_ptp_settime64(info, (const struct timespec64 *)&now);
> --
> 2.26.3