tensorflow/CVE-2021-29557.patch

28 lines
1.3 KiB
Diff
Raw Normal View History

From 7f283ff806b2031f407db64c4d3edcda8fb9f9f5 Mon Sep 17 00:00:00 2001
From: Amit Patankar <amitpatankar@google.com>
Date: Wed, 28 Apr 2021 15:00:39 -0700
Subject: [PATCH] Fix FPE issue in external Eigen source code issue with
`tf.raw_ops.SparseMatMul`.
PiperOrigin-RevId: 370992919
Change-Id: Icfb276fef5fb40928b27c3e44608d2aca72c9fd7
---
tensorflow/core/kernels/sparse_matmul_op.cc | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/tensorflow/core/kernels/sparse_matmul_op.cc b/tensorflow/core/kernels/sparse_matmul_op.cc
index f5747854093c9..a02afafa33e3a 100644
--- a/tensorflow/core/kernels/sparse_matmul_op.cc
+++ b/tensorflow/core/kernels/sparse_matmul_op.cc
@@ -1039,6 +1039,10 @@ class SparseMatMulOp : public OpKernel {
if (transpose_b) {
// TODO(agarwal): avoid transposing the matrix here and directly handle
// transpose in CreateDenseSlices.
+ OP_REQUIRES(ctx, right->dim_size(0) != 0,
+ errors::InvalidArgument("b has an entry 0 in it's shape."));
+ OP_REQUIRES(ctx, right->dim_size(1) != 0,
+ errors::InvalidArgument("b has an entry 0 in it's shape."));
right_tr.reset(
new Tensor(right->dtype(),
TensorShape({right->dim_size(1), right->dim_size(0)})));